core: add number in windows, improve mouse/cursor actions when screen is split

19 files changed, 285 insertions, 219 deletions

diff --git a/doc/de/autogen/plugin_api/completions.txt b/doc/de/autogen/plugin_api/completions.txt
index 2f4abd9ea..179a6e727 100644
--- a/doc/de/autogen/plugin_api/completions.txt
+++ b/doc/de/autogen/plugin_api/completions.txt
@@ -108,6 +108,8 @@
 
 | weechat | weechat_commands | WeeChat Befehle
 
+| weechat | windows_numbers | numbers of windows
+
 | xfer | nick | Nicks vom DCC Chat
 
 |========================================
diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt
index d8a91ccd8..d4560a5ff 100644
--- a/doc/de/autogen/plugin_api/hdata.txt
+++ b/doc/de/autogen/plugin_api/hdata.txt
@@ -500,6 +500,7 @@
   'weechat_plugins'
 
 | weechat | window | Fenster |
+  'number' (integer) +
   'win_x' (integer) +
   'win_y' (integer) +
   'win_width' (integer) +
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index bb97cf54b..0acb0f303 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -14,7 +14,7 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand
       del <name>|-all
       set <name> <option> <value>
       hide|show|toggle <name>
-      scroll <name> <buffer> <scroll_value>
+      scroll <name> <window> <scroll_value>
 
          list: list all bars
      listfull: list all bars (verbose)
@@ -41,7 +41,7 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand
          show: show an hidden bar
        toggle: hide/show a bar
        scroll: scroll bar
-       buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars)
+       window: window number (use '*' for current window or for root bars)
  scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars)
 
 Examples:
@@ -589,56 +589,60 @@ Beispiele:
 [command]*`window`* Fenster verwalten::
 ........................................
 /window  list
-         -1|+1|b#|up|down|left|right
-         splith|splitv [<pct>]
-         resize [+/-]<pct>
+         -1|+1|b#|up|down|left|right [-window <number>]
+         <number>
+         splith|splitv [-window <number>] [<pct>]
+         resize [-window <number>] [+/-]<pct>
          balance
-         merge [all]
-         page_up|page_down
+         merge [-window <number>] [all]
+         page_up|page_down [-window <number>]
          refresh
-         scroll [+/-]<value>[s|m|h|d|M|y]
-         scroll_horiz [+/-]<value>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
-         swap [up|down|left|right]
-         zoom
-
-         list: listet die geöffneten Fenster (ohne Angabe von Parametern wird diese Funktion aufgerufen)
-           -1: springt zum vorherigen Fenster
-           +1: springt zum nächsten Fenster
-           b#: springt zum nächsten Fenster, welches die Buffer Nummer # besitzt
-           up: wechselt zum Fenster über dem aktuellen
-         down: wechselt zum Fenster unter dem aktuellen
-         left: wechselt zum linken Fenster
-        right: wechselt zum rechten Fenster
-       splith: teilt das aktuelle Fenster horizontal
-       splitv: teilt das aktuelle Fenster vertikal
-       resize: verändert die Größe des aktuellen Fensters. Die neue Größe des Fensters ist prozentual <pct> zum Stammfensters groß
-      balance: passt die Größe aller Fenster an
-        merge: vereinigt Fenster miteinander (all = alle Fenster vereinigen)
-      page_up: scrollt eine Seite nach oben
-    page_down: scrollt eine Seite nach unten
-      refresh: Seite wird neu aufgebaut
-       scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
- scroll_horiz: scrollt horizontal eine Anzahl an Spalten (+/-N) oder prozentual von der Fenstergröße ausgehend (dieses scrolling ist nur in Buffern möglich die über einen freien Inhalt verfügen)
-    scroll_up: scrollt ein paar Zeilen nach oben
-  scroll_down: scrollt ein paar Zeilen nach unten
-   scroll_top: scrollt zum Anfang des Buffers
-scroll_bottom: scrollt zum Ende des  Buffers
-scroll_previous_highlight: scrollt zum vorherigen Hightlight
-scroll_next_highlight: scrollt zum nächsten Highlight
-         swap: tauscht die Buffer von zwei Fenstern (mit optionaler Angabe für das Zielfenster)
-         zoom: vergrößert auf Fenster
-
-Bei splith und splitv gibt "pct" die neue Größe des Fensters im Verhältnis zur aktuellen Größe an. Zum Beispiel würde ein Wert von 25 bedeuten, dass das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat.
+         scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
+         scroll_horiz [-window <number>] [+/-]<value>[%]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>]
+         swap [-window <number>] [up|down|left|right]
+         zoom[-window <number>]
+
+         list: list opened windows (without argument, this list is displayed)
+           -1: jump to previous window
+           +1: jump to next window
+           b#: jump to next window displaying buffer number #
+           up: switch to window above current one
+         down: switch to window below current one
+         left: switch to window on the left
+        right: switch to window on the right
+       number: window number (see /window list)
+       splith: split current window horizontally
+       splitv: split current window vertically
+       resize: resize window size, new size is <pct> percentage of parent window
+      balance: balance the sizes of all windows
+        merge: merge window with another (all = keep only one window)
+      page_up: scroll one page up
+    page_down: scroll one page down
+      refresh: refresh screen
+       scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
+ scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content)
+    scroll_up: scroll a few lines up
+  scroll_down: scroll a few lines down
+   scroll_top: scroll to top of buffer
+scroll_bottom: scroll to bottom of buffer
+scroll_previous_highlight: scroll to previous highlight
+scroll_next_highlight: scroll to next highlight
+         swap: swap buffers of two windows (with optional direction for target window)
+         zoom: zoom on window
+
+For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
 
-Beispiele:
-  Springt zum Fenster mit dem Buffer #1:
+Examples:
+  jump to window displaying buffer #1:
     /window b1
-   Scrollt zwei Zeilen hoch:
+  scroll 2 lines up:
     /window scroll -2
-  Scrollt zwei Tage hoch: /window scroll -2d
+  scroll 2 days up:
     /window scroll -2d
-  Scrollt zum Beginn des aktuellen Tages:
+  scroll to beginning of current day:
     /window scroll -d
+  zoom on window #2:
+    /window zoom -window 2
 ........................................
 
diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt
index eec56335c..09c4bacf6 100644
--- a/doc/de/weechat_user.de.txt
+++ b/doc/de/weechat_user.de.txt
@@ -539,7 +539,7 @@ Keys for "cursor" context
 
 These keys are used in context "cursor" (free movement of cursor on screen).
 
-[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Key          | Area     | Description | Command
 | @k(↑)        | -        | Move cursor one line up | /cursor move up
@@ -550,11 +550,11 @@ These keys are used in context "cursor" (free movement of cursor on screen).
 | @k(A-)@k(↓)  | -        | Move cursor one area down | /cursor move area_down
 | @k(A-)@k(←)  | -        | Move cursor one area left | /cursor move area_left
 | @k(A-)@k(→)  | -        | Move cursor one area right | /cursor move area_right
-| @k(b)        | nicklist | Ban nick | /ban ${nick}
-| @k(k)        | nicklist | Kick nick | /kick ${nick}
-| @k(K)        | nicklist | Kick and ban nick | /kickban ${nick}
-| @k(q)        | nicklist | Open query with nick | /query ${nick};/cursor stop
-| @k(w)        | nicklist | Do a whois on nick | /whois ${nick}
+| @k(b)        | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| @k(k)        | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| @k(K)        | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| @k(q)        | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop
+| @k(w)        | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
 | @k(Enter) .3+| -     .3+| Stop cursor mode .3+| /cursor stop
 | @k(C-)@k(j)
 | @k(C-)@k(m)
@@ -567,26 +567,27 @@ Keys for "mouse" context
 
 These keys are used in context "mouse", namely when a mouse event occurs.
 
-[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Button  | Gesture      | Area     | Description | Command
-| ◾◽◽     | left         | chat     | zum vorherigen Buffer springen | /buffer +1
-| ◾◽◽     | right        | chat     | zum nächsten Buffer springen | /buffer +1
-| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /buffer 1
-| ◾◽◽     | right (long) | chat     | wechselt zum letzten Buffer | /input jump_last_buffer
-| wheel ⇑ | -            | chat     | einige Zeilen im Verlaufsspeicher des Buffer nach oben blättern | /window scroll_up
-| wheel ⇓ | -            | chat     | einige Zeilen im Verlaufsspeicher des Buffer nach unten blättern | /window scroll_down
-| ◾◽◽     | up           | nicklist | Nickliste um eine Seite nach oben blättern | /bar scroll nicklist * -100%
-| ◾◽◽     | down         | nicklist | Nickliste um eine Seite nach unten blättern | /bar scroll nicklist * +100%
-| ◾◽◽     | up (long)    | nicklist | springt zum Anfang der Nickliste | /bar scroll nicklist * b
-| ◾◽◽     | down (long)  | nicklist | springt zum Ende der Nickliste | /bar scroll nicklist * e
-| ◾◽◽     | -            | nicklist | Open query with nick | /query ${nick}
-| ◽◽◾     | -            | nicklist | Do a whois on nick | /whois ${nick}
-| ◾◽◽     | left         | nicklist | Kick nick | /kick ${nick}
-| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /kickban ${nick}
-| ◽◽◾     | left         | nicklist | Ban nick | /ban ${nick}
-| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} * -10%
-| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} * +10%
+| ◾◽◽     | -            | chat     | Switch to window | /window ${_window_number}
+| ◾◽◽     | left         | chat     | zum vorherigen Buffer springen | /window ${_window_number};/buffer +1
+| ◾◽◽     | right        | chat     | zum nächsten Buffer springen | /window ${_window_number};/buffer +1
+| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /window ${_window_number};/buffer 1
+| ◾◽◽     | right (long) | chat     | wechselt zum letzten Buffer | /window ${_window_number};/input jump_last_buffer
+| wheel ⇑ | -            | chat     | einige Zeilen im Verlaufsspeicher des Buffer nach oben blättern | /window scroll_up -window ${_window_number}
+| wheel ⇓ | -            | chat     | einige Zeilen im Verlaufsspeicher des Buffer nach unten blättern | /window scroll_down -window ${_window_number}
+| ◾◽◽     | up           | nicklist | Nickliste um eine Seite nach oben blättern | /bar scroll nicklist ${_window_number} -100%
+| ◾◽◽     | down         | nicklist | Nickliste um eine Seite nach unten blättern | /bar scroll nicklist ${_window_number} +100%
+| ◾◽◽     | up (long)    | nicklist | springt zum Anfang der Nickliste | /bar scroll nicklist ${_window_number} b
+| ◾◽◽     | down (long)  | nicklist | springt zum Ende der Nickliste | /bar scroll nicklist ${_window_number} e
+| ◾◽◽     | -            | nicklist | Open query with nick | /window ${_window_number};/query ${nick}
+| ◽◽◾     | -            | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
+| ◾◽◽     | left         | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| ◽◽◾     | left         | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10%
+| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10%
 | ◽◾◽     | -            | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y}
 |========================================
 
diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt
index 1e909099c..45626fdcc 100644
--- a/doc/en/autogen/plugin_api/completions.txt
+++ b/doc/en/autogen/plugin_api/completions.txt
@@ -108,6 +108,8 @@
 
 | weechat | weechat_commands | weechat commands
 
+| weechat | windows_numbers | numbers of windows
+
 | xfer | nick | nicks of DCC chat
 
 |========================================
diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt
index b4c46732c..61bd9ff35 100644
--- a/doc/en/autogen/plugin_api/hdata.txt
+++ b/doc/en/autogen/plugin_api/hdata.txt
@@ -500,6 +500,7 @@
   'weechat_plugins'
 
 | weechat | window | window |
+  'number' (integer) +
   'win_x' (integer) +
   'win_y' (integer) +
   'win_width' (integer) +
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 04e6f595a..9ecda1c33 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -14,7 +14,7 @@ message: message for away (if no message is given, away status is removed)
       del <name>|-all
       set <name> <option> <value>
       hide|show|toggle <name>
-      scroll <name> <buffer> <scroll_value>
+      scroll <name> <window> <scroll_value>
 
          list: list all bars
      listfull: list all bars (verbose)
@@ -41,7 +41,7 @@ message: message for away (if no message is given, away status is removed)
          show: show an hidden bar
        toggle: hide/show a bar
        scroll: scroll bar
-       buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars)
+       window: window number (use '*' for current window or for root bars)
  scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars)
 
 Examples:
@@ -589,18 +589,19 @@ Examples:
 [command]*`window`* manage windows::
 ........................................
 /window  list
-         -1|+1|b#|up|down|left|right
-         splith|splitv [<pct>]
-         resize [+/-]<pct>
+         -1|+1|b#|up|down|left|right [-window <number>]
+         <number>
+         splith|splitv [-window <number>] [<pct>]
+         resize [-window <number>] [+/-]<pct>
          balance
-         merge [all]
-         page_up|page_down
+         merge [-window <number>] [all]
+         page_up|page_down [-window <number>]
          refresh
-         scroll [+/-]<value>[s|m|h|d|M|y]
-         scroll_horiz [+/-]<value>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
-         swap [up|down|left|right]
-         zoom
+         scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
+         scroll_horiz [-window <number>] [+/-]<value>[%]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>]
+         swap [-window <number>] [up|down|left|right]
+         zoom[-window <number>]
 
          list: list opened windows (without argument, this list is displayed)
            -1: jump to previous window
@@ -610,6 +611,7 @@ Examples:
          down: switch to window below current one
          left: switch to window on the left
         right: switch to window on the right
+       number: window number (see /window list)
        splith: split current window horizontally
        splitv: split current window vertically
        resize: resize window size, new size is <pct> percentage of parent window
@@ -640,5 +642,7 @@ Examples:
     /window scroll -2d
   scroll to beginning of current day:
     /window scroll -d
+  zoom on window #2:
+    /window zoom -window 2
 ........................................
 
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index 73073109a..de7470bf1 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -8259,6 +8259,16 @@ Arguments:
 *** '_y': line of focus on screen (first line on top is "0")
 *** '_window': pointer of window with focus ("0x0" for a bar of type "root"
     or for unknown area)
+*** '_window_number': number of window with focus (not set for a bar of type
+    "root" or for unknown area)
+*** '_buffer': pointer of buffer with focus ("0x0" for a bar of type "root"
+    or for unknown area)
+*** '_buffer_number': number of buffer with focus (not set for a bar of type
+    "root" or for unknown area)
+*** '_buffer_plugin': plugin name of buffer with focus (not set for a bar of
+    type "root" or for unknown area)
+*** '_buffer_name': name of buffer with focus (not set for a bar of type "root"
+    or for unknown area)
 *** '_bar_name': name of bar with focus (NULL for chat area or for unknown
     area)
 *** '_bar_item_name': name of bar item with focus (NULL if focus is not in a
@@ -8756,7 +8766,7 @@ Arguments:
 
 * 'buffer': buffer pointer
 * 'property': property name:
-** 'number': number of buffer (starts with 1)
+** 'number': number of buffer (starts to 1)
 ** 'layout_number': number of buffer saved in layout
 ** 'type': buffer type (0: formatted, 1: free content)
 ** 'notify': notify level for buffer
@@ -9325,6 +9335,7 @@ Arguments:
 
 * 'window': window pointer
 * 'property': property name:
+** 'number': number of window (starts to 1)
 ** 'win_x': X position of window in terminal (first column is 0)
 ** 'win_y': Y position of window in terminal (first line is 0)
 ** 'win_width': width of window, in chars
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index 9139cccb1..7a91cae8e 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -538,7 +538,7 @@ Keys for "cursor" context
 
 These keys are used in context "cursor" (free movement of cursor on screen).
 
-[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Key          | Area     | Description | Command
 | @k(↑)        | -        | Move cursor one line up | /cursor move up
@@ -549,11 +549,11 @@ These keys are used in context "cursor" (free movement of cursor on screen).
 | @k(A-)@k(↓)  | -        | Move cursor one area down | /cursor move area_down
 | @k(A-)@k(←)  | -        | Move cursor one area left | /cursor move area_left
 | @k(A-)@k(→)  | -        | Move cursor one area right | /cursor move area_right
-| @k(b)        | nicklist | Ban nick | /ban ${nick}
-| @k(k)        | nicklist | Kick nick | /kick ${nick}
-| @k(K)        | nicklist | Kick and ban nick | /kickban ${nick}
-| @k(q)        | nicklist | Open query with nick | /query ${nick};/cursor stop
-| @k(w)        | nicklist | Do a whois on nick | /whois ${nick}
+| @k(b)        | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| @k(k)        | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| @k(K)        | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| @k(q)        | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop
+| @k(w)        | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
 | @k(Enter) .3+| -     .3+| Stop cursor mode .3+| /cursor stop
 | @k(C-)@k(j)
 | @k(C-)@k(m)
@@ -565,26 +565,27 @@ Keys for "mouse" context
 
 These keys are used in context "mouse", namely when a mouse event occurs.
 
-[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Button  | Gesture      | Area     | Description | Command
-| ◾◽◽     | left         | chat     | Switch to previous buffer | /buffer +1
-| ◾◽◽     | right        | chat     | Switch to next buffer | /buffer +1
-| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /buffer 1
-| ◾◽◽     | right (long) | chat     | Switch to last buffer | /input jump_last_buffer
-| wheel ⇑ | -            | chat     | Scroll up a few lines in buffer history | /window scroll_up
-| wheel ⇓ | -            | chat     | Scroll down a few lines in buffer history | /window scroll_down
-| ◾◽◽     | up           | nicklist | Scroll up one page in nicklist | /bar scroll nicklist * -100%
-| ◾◽◽     | down         | nicklist | Scroll down one page in nicklist | /bar scroll nicklist * +100%
-| ◾◽◽     | up (long)    | nicklist | Go to the beginning of nicklist | /bar scroll nicklist * b
-| ◾◽◽     | down (long)  | nicklist | Go to the end of nicklist | /bar scroll nicklist * e
-| ◾◽◽     | -            | nicklist | Open query with nick | /query ${nick}
-| ◽◽◾     | -            | nicklist | Do a whois on nick | /whois ${nick}
-| ◾◽◽     | left         | nicklist | Kick nick | /kick ${nick}
-| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /kickban ${nick}
-| ◽◽◾     | left         | nicklist | Ban nick | /ban ${nick}
-| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} * -10%
-| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} * +10%
+| ◾◽◽     | -            | chat     | Switch to window | /window ${_window_number}
+| ◾◽◽     | left         | chat     | Switch to previous buffer | /window ${_window_number};/buffer +1
+| ◾◽◽     | right        | chat     | Switch to next buffer | /window ${_window_number};/buffer +1
+| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /window ${_window_number};/buffer 1
+| ◾◽◽     | right (long) | chat     | Switch to last buffer | /window ${_window_number};/input jump_last_buffer
+| wheel ⇑ | -            | chat     | Scroll up a few lines in buffer history | /window scroll_up -window ${_window_number}
+| wheel ⇓ | -            | chat     | Scroll down a few lines in buffer history | /window scroll_down -window ${_window_number}
+| ◾◽◽     | up           | nicklist | Scroll up one page in nicklist | /bar scroll nicklist ${_window_number} -100%
+| ◾◽◽     | down         | nicklist | Scroll down one page in nicklist | /bar scroll nicklist ${_window_number} +100%
+| ◾◽◽     | up (long)    | nicklist | Go to the beginning of nicklist | /bar scroll nicklist ${_window_number} b
+| ◾◽◽     | down (long)  | nicklist | Go to the end of nicklist | /bar scroll nicklist ${_window_number} e
+| ◾◽◽     | -            | nicklist | Open query with nick | /window ${_window_number};/query ${nick}
+| ◽◽◾     | -            | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
+| ◾◽◽     | left         | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| ◽◽◾     | left         | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10%
+| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10%
 | ◽◾◽     | -            | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y}
 |========================================
 
diff --git a/doc/fr/autogen/plugin_api/completions.txt b/doc/fr/autogen/plugin_api/completions.txt
index 5aa171ffe..eb090fc45 100644
--- a/doc/fr/autogen/plugin_api/completions.txt
+++ b/doc/fr/autogen/plugin_api/completions.txt
@@ -108,6 +108,8 @@
 
 | weechat | weechat_commands | commandes weechat
 
+| weechat | windows_numbers | numéros des fenêtres
+
 | xfer | nick | pseudos de la discussion DCC
 
 |========================================
diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt
index eb33cc3e0..0eecffe6e 100644
--- a/doc/fr/autogen/plugin_api/hdata.txt
+++ b/doc/fr/autogen/plugin_api/hdata.txt
@@ -500,6 +500,7 @@
   'weechat_plugins'
 
 | weechat | window | fenêtre |
+  'number' (integer) +
   'win_x' (integer) +
   'win_y' (integer) +
   'win_width' (integer) +
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 8d7a900cd..f7b3d2645 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -14,7 +14,7 @@ message: message pour l'absence (si pas de message donné, le statut d'absence e
       del <nom>|-all
       set <nom> <option> <valeur>
       hide|show|toggle <nom>
-      scroll <nom> <tampon> <valeur_scroll>
+      scroll <nom> <fenêtre> <valeur_scroll>
 
          list: lister toutes les barres
      listfull: lister toutes les barres (verbeux)
@@ -41,7 +41,7 @@ message: message pour l'absence (si pas de message donné, le statut d'absence e
          show: montrer une barre cachée
        toggle: cacher/montrer une barre
        scroll: faire défiler la barre
-       tampon: catégorie et nom du tampon ('*' signifie le tampon courant, vous devez utiliser '*' pour les barres de type root)
+      fenêtre: numéro de fenêtre (utilisez '*' pour la fenêtre courante ou une barre de type root)
 valeur_scroll: valeur pour le défilement: 'x' ou 'y' (optionnel), suivi par '+', '-', 'b' (début) ou 'e' (fin), valeur (pour +/-), et un % optionnel (pour faire défiler par % de la largeur/hauteur, sinon la valeur est un nombre de caractères)
 
 Exemples:
@@ -589,18 +589,19 @@ Exemples:
 [command]*`window`* gestion des fenêtres::
 ........................................
 /window  list
-         -1|+1|b#|up|down|left|right
-         splith|splitv [<pct>]
-         resize [+/-]<pct>
+         -1|+1|b#|up|down|left|right [-window <numéro>]
+         <numéro>
+         splith|splitv [-window <numéro>] [<pct>]
+         resize [-window <numéro>] [+/-]<pct>
          balance
-         merge [all]
-         page_up|page_down
+         merge [-window <numéro>] [all]
+         page_up|page_down [-window <numéro>]
          refresh
-         scroll [+/-]<valeur>[s|m|h|d|M|y]
-         scroll_horiz [+/-]<valeur>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
-         swap [up|down|left|right]
-         zoom
+         scroll [-window <numéro>] [+/-]<valeur>[s|m|h|d|M|y]
+         scroll_horiz [-window <numéro>] [+/-]<valeur>[%]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <numéro>]
+         swap [-window <numéro>] [up|down|left|right]
+         zoom [-window <numéro>]
 
          list: lister les fenêtres ouvertes (sans paramètre, cette liste est affichée)
            -1: sauter à la fenêtre précédente
@@ -610,6 +611,7 @@ Exemples:
          down: sauter à la fenêtre au dessous
          left: sauter à la fenêtre à gauche
         right: sauter à la fenêtre à droite
+       numéro: numéro de fenêtre (voir /window list)
        splith: éclater la fenêtre en deux horizontalement
        splitv: éclater la fenêtre en deux verticalement
        resize: redimensionner une fenêtre, la nouvelle taille est <pct> pourcentage de la fenêtre parent
@@ -640,5 +642,7 @@ Exemples:
     /window scroll -2d
   défilement jusqu'au début du jour courant:
     /window scroll -d
+  zoom sur la fenêtre numéro 2:
+    /window zoom -window 2
 ........................................
 
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index 94b142bf0..2454498c3 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -8391,7 +8391,17 @@ Paramètres :
 *** '_x' : colonne du focus sur l'écran (la première colonne sur la gauche
     est "0")
 *** '_y' : ligne du focus sur l'écran (la première ligne en haut est "0")
-*** '_window' : pointeur de la fenêtre avec le focus (NULL pour une barre de
+*** '_window' : pointeur de la fenêtre avec le focus ("0x0" pour une barre de
+    type "root" ou pour une zone inconnue)
+*** '_window_number' : numéro de la fenêtre avec le focus (non défini pour une
+    barre de type "root" ou pour une zone inconnue)
+*** '_buffer' : pointeur du tampon avec le focus ("0x0" pour une barre de type
+    "root" ou pour une zone inconnue)
+*** '_buffer_number' : numéro du tampon avec le focus (non défini pour une barre
+    de type "root" ou pour une zone inconnue)
+*** '_buffer_plugin' : nom d'extension du tampon avec le focus (non défini pour
+    une barre de type "root" ou pour une zone inconnue)
+*** '_buffer_name' : nom du tampon avec le focus (non défini pour une barre de
     type "root" ou pour une zone inconnue)
 *** '_bar_name' : nom de la barre avec le focus (NULL pour la zone de discussion
     ("chat") ou pour une zone inconnue)
@@ -9483,6 +9493,7 @@ Paramètres :
 
 * 'window' : pointeur vers la fenêtre
 * 'property' : nom de la propriété :
+** 'number' : numéro de la fenêtre (commence à 1)
 ** 'win_x' : position X de la fenêtre dans le terminal (la première colonne est
    0)
 ** 'win_y' : position Y de la fenêtre dans le terminal (la première ligne est
diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt
index 07b60e55f..8d0eff75a 100644
--- a/doc/fr/weechat_user.fr.txt
+++ b/doc/fr/weechat_user.fr.txt
@@ -547,7 +547,7 @@ Touches pour le contexte "cursor"
 Ces touches sont utilisées dans le contexte "cursor" (mouvement libre du curseur
 à l'écran).
 
-[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Touche       | Zone              | Description | Commande
 | @k(↑)        | -                 | Déplacer le curseur d'une ligne vers le haut | /cursor move up
@@ -558,11 +558,11 @@ Ces touches sont utilisées dans le contexte "cursor" (mouvement libre du curseu
 | @k(A-)@k(↓)  | -                 | Déplacer le curseur vers la zone en dessous | /cursor move area_down
 | @k(A-)@k(←)  | -                 | Déplacer le curseur vers la zone sur la gauche | /cursor move area_left
 | @k(A-)@k(→)  | -                 | Déplacer le curseur vers la zone sur la droite | /cursor move area_right
-| @k(b)        | liste des pseudos | Bannir le pseudo | /ban ${nick}
-| @k(k)        | liste des pseudos | Retirer par la force le pseudo | /kick ${nick}
-| @k(K)        | liste des pseudos | Retirer par la force et bannir le pseudo | /kickban ${nick}
-| @k(q)        | liste des pseudos | Ouvrir une discussion avec le pseudo | /query ${nick};/cursor stop
-| @k(w)        | liste des pseudos | Effectuer un whois sur le pseudo | /whois ${nick}
+| @k(b)        | liste des pseudos | Bannir le pseudo | /window ${_window_number};/ban ${nick}
+| @k(k)        | liste des pseudos | Retirer par la force le pseudo | /window ${_window_number};/kick ${nick}
+| @k(K)        | liste des pseudos | Retirer par la force et bannir le pseudo | /window ${_window_number};/kickban ${nick}
+| @k(q)        | liste des pseudos | Ouvrir une discussion avec le pseudo | /window ${_window_number};/query ${nick};/cursor stop
+| @k(w)        | liste des pseudos | Effectuer un whois sur le pseudo | /window ${_window_number};/whois ${nick}
 | @k(Enter) .3+| -              .3+| Stop cursor mode .3+| /cursor stop
 | @k(C-)@k(j)
 | @k(C-)@k(m)
@@ -575,26 +575,27 @@ Touches pour le contexte "mouse"
 Ces touches sont utilisées dans le contexte "mouse", c'est-à-dire lorsqu'un
 évènement de la souris se produit.
 
-[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Bouton     | Geste        | Zone              | Description | Commande
-| ◾◽◽        | left         | chat              | Aller au tampon précédent | /buffer +1
-| ◾◽◽        | right        | chat              | Aller au tampon suivant | /buffer +1
-| ◾◽◽        | left (long)  | chat              | Aller au premier tampon | /buffer 1
-| ◾◽◽        | right (long) | chat              | Aller au dernier tampon | /input jump_last_buffer
-| roulette ⇑ | -            | chat              | Monter de quelques lignes dans l'historique du tampon | /window scroll_up
-| roulette ⇓ | -            | chat              | Descendre de quelques lignes dans l'historique du tampon | /window scroll_down
-| ◾◽◽        | up           | liste des pseudos | Monter d'une page dans la liste des pseudos | /bar scroll nicklist * -100%
-| ◾◽◽        | down         | liste des pseudos | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist * +100%
-| ◾◽◽        | up (long)    | liste des pseudos | Aller au début de la liste des pseudos | /bar scroll nicklist * b
-| ◾◽◽        | down (long)  | liste des pseudos | Aller à la fin de la liste des pseudos | /bar scroll nicklist * e
-| ◾◽◽        | -            | liste des pseudos | Ouvrir une discussion avec le pseudo | /query ${nick}
-| ◽◽◾        | -            | liste des pseudos | Effectuer un whois sur le pseudo | /whois ${nick}
-| ◾◽◽        | left         | liste des pseudos | Retirer par la force le pseudo | /kick ${nick}
-| ◾◽◽        | left (long)  | liste des pseudos | Retirer par la force et bannir le pseudo | /kickban ${nick}
-| ◽◽◾        | left         | liste des pseudos | Bannir le pseudo | /ban ${nick}
-| roulette ⇑ | -            | toute barre       | Faire défiler la barre de -10% | /bar scroll ${_bar_name} * -10%
-| roulette ⇓ | -            | toute barre       | Faire défiler la barre de +10% | /bar scroll ${_bar_name} * +10%
+| ◾◽◽        | -            | chat              | Aller à la fenêtre | /window ${_window_number}
+| ◾◽◽        | left         | chat              | Aller au tampon précédent | /window ${_window_number};/buffer +1
+| ◾◽◽        | right        | chat              | Aller au tampon suivant | /window ${_window_number};/buffer +1
+| ◾◽◽        | left (long)  | chat              | Aller au premier tampon | /window ${_window_number};/buffer 1
+| ◾◽◽        | right (long) | chat              | Aller au dernier tampon | /window ${_window_number};/input jump_last_buffer
+| roulette ⇑ | -            | chat              | Monter de quelques lignes dans l'historique du tampon | /window scroll_up -window ${_window_number}
+| roulette ⇓ | -            | chat              | Descendre de quelques lignes dans l'historique du tampon | /window scroll_down -window ${_window_number}
+| ◾◽◽        | up           | liste des pseudos | Monter d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} -100%
+| ◾◽◽        | down         | liste des pseudos | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} +100%
+| ◾◽◽        | up (long)    | liste des pseudos | Aller au début de la liste des pseudos | /bar scroll nicklist ${_window_number} b
+| ◾◽◽        | down (long)  | liste des pseudos | Aller à la fin de la liste des pseudos | /bar scroll nicklist ${_window_number} e
+| ◾◽◽        | -            | liste des pseudos | Ouvrir une discussion avec le pseudo | /window ${_window_number};/query ${nick}
+| ◽◽◾        | -            | liste des pseudos | Effectuer un whois sur le pseudo | /window ${_window_number};/whois ${nick}
+| ◾◽◽        | left         | liste des pseudos | Retirer par la force le pseudo | /window ${_window_number};/kick ${nick}
+| ◾◽◽        | left (long)  | liste des pseudos | Retirer par la force et bannir le pseudo | /window ${_window_number};/kickban ${nick}
+| ◽◽◾        | left         | liste des pseudos | Bannir le pseudo | /window ${_window_number};/ban ${nick}
+| roulette ⇑ | -            | toute barre       | Faire défiler la barre de -10% | /bar scroll ${_bar_name} ${_window_number} -10%
+| roulette ⇓ | -            | toute barre       | Faire défiler la barre de +10% | /bar scroll ${_bar_name} ${_window_number} +10%
 | ◽◾◽        | -            | n'importe où      | Démarrer le mode curseur ("cursor") à ce point | /cursor go ${_x},${_y}
 |========================================
 
diff --git a/doc/it/autogen/plugin_api/completions.txt b/doc/it/autogen/plugin_api/completions.txt
index eab556506..a122bd267 100644
--- a/doc/it/autogen/plugin_api/completions.txt
+++ b/doc/it/autogen/plugin_api/completions.txt
@@ -108,6 +108,8 @@
 
 | weechat | weechat_commands | comandi di weechat
 
+| weechat | windows_numbers | numbers of windows
+
 | xfer | nick | nick della chat DCC
 
 |========================================
diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt
index 1de895931..c0e0446e2 100644
--- a/doc/it/autogen/plugin_api/hdata.txt
+++ b/doc/it/autogen/plugin_api/hdata.txt
@@ -500,6 +500,7 @@
   'weechat_plugins'
 
 | weechat | window | finestra |
+  'number' (integer) +
   'win_x' (integer) +
   'win_y' (integer) +
   'win_width' (integer) +
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index ea9d7c93a..607e4c969 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -9,12 +9,12 @@ messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene r
 [command]*`bar`* gestione barre::
 ........................................
 /bar  list|listfull|listitems
-      add <nome> <tipo>[,<cond1>[,<cond2>...]] <posizione> <dimensione> <separatore> <elemento1>[,<elemento2>...]
+      add <name> <type>[,<cond1>[,<cond2>...]] <position> <size> <separator> <item1>[,<item2>...]
       default [input|title|status|nicklist]
-      del <nome>|-all
-      set <nome> <opzione> <valore>
-      hide|show|toggle <nome>
-      scroll <nome> <buffer> <scroll_value>
+      del <name>|-all
+      set <name> <option> <value>
+      hide|show|toggle <name>
+      scroll <name> <window> <scroll_value>
 
          list: list all bars
      listfull: list all bars (verbose)
@@ -41,7 +41,7 @@ messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene r
          show: show an hidden bar
        toggle: hide/show a bar
        scroll: scroll bar
-       buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars)
+       window: window number (use '*' for current window or for root bars)
  scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars)
 
 Examples:
@@ -589,56 +589,60 @@ Esempi:
 [command]*`window`* gestione finestre::
 ........................................
 /window  list
-         -1|+1|b#|up|down|left|right
-         splith|splitv [<pct>]
-         resize [+/-] <pct>
+         -1|+1|b#|up|down|left|right [-window <number>]
+         <number>
+         splith|splitv [-window <number>] [<pct>]
+         resize [-window <number>] [+/-]<pct>
          balance
-         merge [all]
-         page_up|page_down
+         merge [-window <number>] [all]
+         page_up|page_down [-window <number>]
          refresh
-         scroll|[+/-]<valore>[s|m|h|d|M|y]
-         scroll_horiz [+/-]<valore>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
-         swap [up|down|left|right]
-         zoom
-
-         list: elenca le finestre aperte (senza argomento, questa lista viene visualizzata)
-           -1: salta alla finestra precedente
-           +1: salta alla finestra successiva
-           b#: salta alla finestra successiva che visualizza il buffer numero #
-           up: passa alla finestra superiore a quella corrente
-         down: passa alla finestra inferiore a quella attiva
-         left: passa alla finestra a sinistra
-        right: passa alla finestra a destra
-       splith: divide la finestra attiva orizzontalmente
-       splitv: divide la finestra attiva verticalmente
-       resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore
-      balance: bilancia le dimensioni tutte le finestre
-        merge: unisce la finestra con un'altra (all = mantiente una sola finestra)
-      page_up: scorre di una pagina in alto
-    page_down: scorre di una pagina in basso
-      refresh: aggiorna lo schermo
-       scroll: scorre di un numero di righe (+/-N) o in base al tempo: s=secondi, m=minuti, h=ore, d=giorni, M=mesi, y=anni
- scroll_horiz: scorre orizzontalmente un numero di colonne (+/-N) una percentuale della dimensione della finestra (questo scorrimento è possibile solo sui buffer con contenuto libero)
-    scroll_up: scorre di alcune righe in alto
-  scroll_down: scorre di alcune righe in basso
-   scroll_top: scorre fino all'inizio del buffer
-scroll_bottom: scorre fino alla fine del buffer buffer
-scroll_previous_highlight: passa all'evento precedente
-    scroll_next_highlight: passa all'evento successivo
-         swap: scambia i buffer di due finestra (con direzione opzionale per la finestra di destinazione)
-         zoom: ingrandimento sulla finestra
-
-Per splith e splitv, pct è una percentuale che rappresenta la dimensione della nuova finestra, calcolata con la finestra attiva come riferimento per la dimensione. Per esempio 25 vuol dire creare una finestra di dimensione = dimensione_attuale / 4
+         scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
+         scroll_horiz [-window <number>] [+/-]<value>[%]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>]
+         swap [-window <number>] [up|down|left|right]
+         zoom[-window <number>]
+
+         list: list opened windows (without argument, this list is displayed)
+           -1: jump to previous window
+           +1: jump to next window
+           b#: jump to next window displaying buffer number #
+           up: switch to window above current one
+         down: switch to window below current one
+         left: switch to window on the left
+        right: switch to window on the right
+       number: window number (see /window list)
+       splith: split current window horizontally
+       splitv: split current window vertically
+       resize: resize window size, new size is <pct> percentage of parent window
+      balance: balance the sizes of all windows
+        merge: merge window with another (all = keep only one window)
+      page_up: scroll one page up
+    page_down: scroll one page down
+      refresh: refresh screen
+       scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
+ scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content)
+    scroll_up: scroll a few lines up
+  scroll_down: scroll a few lines down
+   scroll_top: scroll to top of buffer
+scroll_bottom: scroll to bottom of buffer
+scroll_previous_highlight: scroll to previous highlight
+scroll_next_highlight: scroll to next highlight
+         swap: swap buffers of two windows (with optional direction for target window)
+         zoom: zoom on window
+
+For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
 
-Esempi:
-  salta alla finestra che visualizza il buffer #1:
+Examples:
+  jump to window displaying buffer #1:
     /window b1
-  scorre di due righe in alto:
+  scroll 2 lines up:
     /window scroll -2
-  scorre all'indietro di due giorni:
+  scroll 2 days up:
     /window scroll -2d
-  scorre all'inizio del giorno attuale:
-     /window scroll -d
+  scroll to beginning of current day:
+    /window scroll -d
+  zoom on window #2:
+    /window zoom -window 2
 ........................................
 
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index b9e5ab4a8..ff4cb3f04 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -8314,6 +8314,16 @@ Argomenti:
 *** '_y': line of focus on screen (first line on top is "0")
 *** '_window': pointer of window with focus ("0x0" for a bar of type "root"
     or for unknown area)
+*** '_window_number': number of window with focus (not set for a bar of type
+    "root" or for unknown area)
+*** '_buffer': pointer of buffer with focus ("0x0" for a bar of type "root"
+    or for unknown area)
+*** '_buffer_number': number of buffer with focus (not set for a bar of type
+    "root" or for unknown area)
+*** '_buffer_plugin': plugin name of buffer with focus (not set for a bar of
+    type "root" or for unknown area)
+*** '_buffer_name': name of buffer with focus (not set for a bar of type "root"
+    or for unknown area)
 *** '_bar_name': name of bar with focus (NULL for chat area or for unknown
     area)
 *** '_bar_item_name': name of bar item with focus (NULL if focus is not in a
@@ -9399,6 +9409,8 @@ Argomenti:
 
 * 'window': puntatore alla finestra
 * 'property': nome della proprietà:
+// TRANSLATION MISSING
+** 'number': number of window (starts to 1)
 ** 'win_x': posizione X della finestra nel terminale (la prima colonna è 0)
 ** 'win_y': posizione Y della finestra nel terminale (la prima riga è 0)
 ** 'win_width': larghezza della finestra, in caratteri
diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt
index 7e9a34ba6..53da149d0 100644
--- a/doc/it/weechat_user.it.txt
+++ b/doc/it/weechat_user.it.txt
@@ -547,7 +547,7 @@ Keys for "cursor" context
 
 These keys are used in context "cursor" (free movement of cursor on screen).
 
-[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Key          | Area     | Description | Command
 | @k(↑)        | -        | Move cursor one line up | /cursor move up
@@ -558,11 +558,11 @@ These keys are used in context "cursor" (free movement of cursor on screen).
 | @k(A-)@k(↓)  | -        | Move cursor one area down | /cursor move area_down
 | @k(A-)@k(←)  | -        | Move cursor one area left | /cursor move area_left
 | @k(A-)@k(→)  | -        | Move cursor one area right | /cursor move area_right
-| @k(b)        | nicklist | Ban nick | /ban ${nick}
-| @k(k)        | nicklist | Kick nick | /kick ${nick}
-| @k(K)        | nicklist | Kick and ban nick | /kickban ${nick}
-| @k(q)        | nicklist | Open query with nick | /query ${nick};/cursor stop
-| @k(w)        | nicklist | Do a whois on nick | /whois ${nick}
+| @k(b)        | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| @k(k)        | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| @k(K)        | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| @k(q)        | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop
+| @k(w)        | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
 | @k(Enter) .3+| -     .3+| Stop cursor mode .3+| /cursor stop
 | @k(C-)@k(j)
 | @k(C-)@k(m)
@@ -575,26 +575,27 @@ Keys for "mouse" context
 
 These keys are used in context "mouse", namely when a mouse event occurs.
 
-[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"]
+[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
 | Button  | Gesture      | Area     | Description | Command
-| ◾◽◽     | left         | chat     | Passa al buffer precedente | /buffer +1
-| ◾◽◽     | right        | chat     | Passa al buffer successivo | /buffer +1
-| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /buffer 1
-| ◾◽◽     | right (long) | chat     | Passa all'ultimo buffer | /input jump_last_buffer
-| wheel ⇑ | -            | chat     | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up
-| wheel ⇓ | -            | chat     | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down
-| ◾◽◽     | up           | nicklist | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist * -100%
-| ◾◽◽     | down         | nicklist | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist * +100%
-| ◾◽◽     | up (long)    | nicklist | Sposta all'inizio della lista nick | /bar scroll nicklist * b
-| ◾◽◽     | down (long)  | nicklist | Sposta alla fine della lista nick | /bar scroll nicklist * e
-| ◾◽◽     | -            | nicklist | Open query with nick | /query ${nick}
-| ◽◽◾     | -            | nicklist | Do a whois on nick | /whois ${nick}
-| ◾◽◽     | left         | nicklist | Kick nick | /kick ${nick}
-| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /kickban ${nick}
-| ◽◽◾     | left         | nicklist | Ban nick | /ban ${nick}
-| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} * -10%
-| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} * +10%
+| ◾◽◽     | -            | chat     | Switch to window | /window ${_window_number}
+| ◾◽◽     | left         | chat     | Passa al buffer precedente | /window ${_window_number};/buffer +1
+| ◾◽◽     | right        | chat     | Passa al buffer successivo | /window ${_window_number};/buffer +1
+| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /window ${_window_number};/buffer 1
+| ◾◽◽     | right (long) | chat     | Passa all'ultimo buffer | /window ${_window_number};/input jump_last_buffer
+| wheel ⇑ | -            | chat     | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up -window ${_window_number}
+| wheel ⇓ | -            | chat     | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down -window ${_window_number}
+| ◾◽◽     | up           | nicklist | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist ${_window_number} -100%
+| ◾◽◽     | down         | nicklist | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist ${_window_number} +100%
+| ◾◽◽     | up (long)    | nicklist | Sposta all'inizio della lista nick | /bar scroll nicklist ${_window_number} b
+| ◾◽◽     | down (long)  | nicklist | Sposta alla fine della lista nick | /bar scroll nicklist ${_window_number} e
+| ◾◽◽     | -            | nicklist | Open query with nick | /window ${_window_number};/query ${nick}
+| ◽◽◾     | -            | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
+| ◾◽◽     | left         | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
+| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| ◽◽◾     | left         | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
+| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10%
+| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10%
 | ◽◾◽     | -            | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y}
 |========================================