By default, honor EWMH focus requests

diff --git a/contrib/bash_completion b/contrib/bash_completion
index 5a04e5c957765e4e4fa5cd618d08724471a222dc..777134de38e26feb50f657e42d2f1b8ad3afd3d9 100644 (file)
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -1,7 +1,7 @@
 _bspc() {
     local commands='window desktop monitor query pointer rule restore control config quit'
 
-    local settings='focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color focused_sticky_border_color normal_sticky_border_color focused_private_border_color active_private_border_color normal_private_border_color urgent_border_color focused_frame_opacity active_frame_opacity normal_frame_opacity border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio growth_factor borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor apply_floating_atom auto_alternate auto_cancel history_aware_focus honor_ewmh_focus fit_monitor'
+    local settings='focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color focused_sticky_border_color normal_sticky_border_color focused_private_border_color active_private_border_color normal_private_border_color urgent_border_color focused_frame_opacity active_frame_opacity normal_frame_opacity border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio growth_factor borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor apply_floating_atom auto_alternate auto_cancel history_aware_focus ignore_ewmh_focus fit_monitor'
 
     COMPREPLY=()
 

diff --git a/contrib/zsh_completion b/contrib/zsh_completion
index 4aa8eabc9beb01206653ab953e45a9ce544d8794..d0e5c66deddf893e9fecb2bb6865dc244010b530 100644 (file)
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -3,7 +3,7 @@
 _bspc() {
     local -a commands settings
     commands=('window' 'desktop' 'monitor' 'query' 'pointer' 'rule' 'restore' 'control' 'config' 'quit')
-    settings=('focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'focused_sticky_border_color' 'normal_sticky_border_color' 'focused_private_border_color' 'active_private_border_color' 'normal_private_border_color' 'urgent_border_color' 'focused_frame_opacity' 'active_frame_opacity' 'normal_frame_opacity' 'border_width' 'window_gap' 'top_padding' 'right_padding' 'bottom_padding' 'left_padding' 'split_ratio' 'growth_factor' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus' 'honor_ewmh_focus' 'fit_monitor')
+    settings=('focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'focused_sticky_border_color' 'normal_sticky_border_color' 'focused_private_border_color' 'active_private_border_color' 'normal_private_border_color' 'urgent_border_color' 'focused_frame_opacity' 'active_frame_opacity' 'normal_frame_opacity' 'border_width' 'window_gap' 'top_padding' 'right_padding' 'bottom_padding' 'left_padding' 'split_ratio' 'growth_factor' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus' 'ignore_ewmh_focus' 'fit_monitor')
     if (( CURRENT == 2 )) ; then
         _values 'command' "$commands[@]"
     elif (( CURRENT == 3 )) ; then

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index 084fedf21eb9fa230eaa29eda8f8a21be62f5e92..d37c4fe0ede3e5d3baec02c9ecadd75b7b745d76 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -2,12 +2,12 @@
 .\"     Title: bspwm
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/23/2013
+.\"      Date: 10/26/2013
 .\"    Manual: Bspwm Manual
 .\"    Source: Bspwm 0.8.6
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "10/23/2013" "Bspwm 0\&.8\&.6" "Bspwm Manual"
+.TH "BSPWM" "1" "10/26/2013" "Bspwm 0\&.8\&.6" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1049,9 +1049,9 @@ Set the value of the
 atom of each window according to its floating state\&.
 .RE
 .PP
-\fIhonor_ewmh_focus\fR
+\fIignore_ewmh_focus\fR
 .RS 4
-Honor EWMH requests to focus a window\&.
+Ignore EWMH requests to focus a window\&.
 .RE
 .PP
 \fIfit_monitor\fR

diff --git a/doc/bspwm.1.txt b/doc/bspwm.1.txt
index d011548d049db12b8eb6ea554e3aa08ab75545b5..b767d5bb21bda37acc14ba11832ec084beb9aa3a 100644 (file)
--- a/doc/bspwm.1.txt
+++ b/doc/bspwm.1.txt
@@ -636,8 +636,8 @@ Global Settings
 'apply_floating_atom'::
     Set the value of the '_BSPWM_FLOATING_WINDOW' atom of each window according to its floating state.
 
-'honor_ewmh_focus'::
-    Honor EWMH requests to focus a window.
+'ignore_ewmh_focus'::
+    Ignore EWMH requests to focus a window.
 
 'fit_monitor'::
     Keep floating windows inside their monitor.

diff --git a/events.c b/events.c
index 666c0f953ec0d32c91a02cbcdbdf6fe9ae9dabbc..758f995046753c36edf23141874db5c097f49f2d 100644 (file)
--- a/events.c
+++ b/events.c
@@ -238,7 +238,7 @@ void client_message(xcb_generic_event_t *evt)
         handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[1], e->data.data32[0]);
         handle_state(loc.monitor, loc.desktop, loc.node, e->data.data32[2], e->data.data32[0]);
     } else if (e->type == ewmh->_NET_ACTIVE_WINDOW) {
-        if (!honor_ewmh_focus || loc.node == mon->desk->focus)
+        if (ignore_ewmh_focus || loc.node == mon->desk->focus)
             return;
         if (loc.desktop->focus->client->fullscreen && loc.desktop->focus != loc.node) {
             set_fullscreen(loc.desktop->focus, false);

diff --git a/messages.c b/messages.c
index 29830506e855474f91f6b6459c242c7e4dd5d5d2..0e1035d33b64ff17b60a8ab1968f9c340338c839 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -930,7 +930,7 @@ bool set_setting(coordinates_t loc, char *name, char *value)
         SETBOOL(auto_alternate)
         SETBOOL(auto_cancel)
         SETBOOL(history_aware_focus)
-        SETBOOL(honor_ewmh_focus)
+        SETBOOL(ignore_ewmh_focus)
         SETBOOL(fit_monitor)
 #undef SETBOOL
     } else {
@@ -1004,7 +1004,7 @@ bool get_setting(coordinates_t loc, char *name, char* rsp)
     GETBOOL(auto_alternate)
     GETBOOL(auto_cancel)
     GETBOOL(history_aware_focus)
-    GETBOOL(honor_ewmh_focus)
+    GETBOOL(ignore_ewmh_focus)
     GETBOOL(fit_monitor)
 #undef GETBOOL
     else

diff --git a/settings.c b/settings.c
index 99af2b93181baa1f020afb75108d89330ae0f3f9..e1db6eb46101499835a1f609372f8c028d9f1dfe 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -76,6 +76,6 @@ void load_settings(void)
     auto_alternate = AUTO_ALTERNATE;
     auto_cancel = AUTO_CANCEL;
     history_aware_focus = HISTORY_AWARE_FOCUS;
-    honor_ewmh_focus = HONOR_EWMH_FOCUS;
+    ignore_ewmh_focus = IGNORE_EWMH_FOCUS;
     fit_monitor = FIT_MONITOR;
 }

diff --git a/settings.h b/settings.h
index 673308de2365a8a6130d2f59be0b94ed2e9afdce..275c420d46b777d9682af5950d1add419cfc3dac 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -61,7 +61,7 @@
 #define AUTO_ALTERNATE           false
 #define AUTO_CANCEL              false
 #define APPLY_FLOATING_ATOM      false
-#define HONOR_EWMH_FOCUS         false
+#define IGNORE_EWMH_FOCUS        false
 #define FIT_MONITOR              false
 
 char focused_border_color[MAXLEN];
@@ -94,7 +94,7 @@ bool apply_floating_atom;
 bool auto_alternate;
 bool auto_cancel;
 bool history_aware_focus;
-bool honor_ewmh_focus;
+bool ignore_ewmh_focus;
 bool fit_monitor;
 
 void run_config(void);