Remove setting: wm_name

The above setting's purpose was to replace `wmname` but it appears that
it can't be done without violating the EWMH standards and creating bad
side effects.
This commit is contained in:
Bastien Dejean 2013-09-05 11:09:24 +02:00
parent ea49ed35d7
commit 824ee423c9
10 changed files with 6 additions and 33 deletions

View file

@ -1,7 +1,7 @@
_bspc() { _bspc() {
local commands='window desktop monitor query pointer rule restore control config quit' 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 urgent_border_color border_width window_gap split_ratio wm_name borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor adaptative_raise apply_shadow_property auto_alternate auto_cancel history_aware_focus' 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 urgent_border_color border_width window_gap split_ratio borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor adaptative_raise apply_shadow_property auto_alternate auto_cancel history_aware_focus'
COMPREPLY=() COMPREPLY=()

View file

@ -41,7 +41,7 @@ int main(int argc, char *argv[])
while ((opt = getopt(argc, argv, "hvc:s:p:")) != -1) { while ((opt = getopt(argc, argv, "hvc:s:p:")) != -1) {
switch (opt) { switch (opt) {
case 'h': case 'h':
printf("bspwm [-h|-v|-c CONFIG_PATH|-s PANEL_FIFO|-p PANEL_PREFIX]\n"); printf(WM_NAME " [-h|-v|-c CONFIG_PATH|-s PANEL_FIFO|-p PANEL_PREFIX]\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'v': case 'v':
@ -108,7 +108,6 @@ int main(int argc, char *argv[])
load_settings(); load_settings();
run_config(); run_config();
ewmh_update_wm_name();
while (running) { while (running) {
@ -213,6 +212,7 @@ void setup(void)
ewmh->_NET_WM_WINDOW_TYPE_UTILITY, ewmh->_NET_WM_WINDOW_TYPE_UTILITY,
ewmh->_NET_WM_WINDOW_TYPE_TOOLBAR}; ewmh->_NET_WM_WINDOW_TYPE_TOOLBAR};
xcb_ewmh_set_wm_name(ewmh, root, strlen(WM_NAME), WM_NAME);
xcb_ewmh_set_supported(ewmh, default_screen, LENGTH(net_atoms), net_atoms); xcb_ewmh_set_supported(ewmh, default_screen, LENGTH(net_atoms), net_atoms);
ewmh_set_supporting(motion_recorder); ewmh_set_supporting(motion_recorder);

View file

@ -2,12 +2,12 @@
.\" Title: bspwm .\" Title: bspwm
.\" Author: [see the "Author" section] .\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 09/02/2013 .\" Date: 09/05/2013
.\" Manual: Bspwm Manual .\" Manual: Bspwm Manual
.\" Source: Bspwm 0.8 .\" Source: Bspwm 0.8
.\" Language: English .\" Language: English
.\" .\"
.TH "BSPWM" "1" "09/02/2013" "Bspwm 0\&.8" "Bspwm Manual" .TH "BSPWM" "1" "09/05/2013" "Bspwm 0\&.8" "Bspwm Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
@ -898,13 +898,6 @@ Value of the gap that separates windows\&.
Default split ratio\&. Default split ratio\&.
.RE .RE
.PP .PP
\fIwm_name\fR
.RS 4
The value that shall be used for the
\fI_NET_WM_NAME\fR
property of the root window\&.
.RE
.PP
\fIborderless_monocle\fR \fIborderless_monocle\fR
.RS 4 .RS 4
Remove borders for tiled windows in monocle mode\&. Remove borders for tiled windows in monocle mode\&.

View file

@ -550,9 +550,6 @@ All the boolean settings are 'false' by default.
'split_ratio':: 'split_ratio'::
Default split ratio. Default split ratio.
'wm_name'::
The value that shall be used for the '_NET_WM_NAME' property of the root window.
'borderless_monocle':: 'borderless_monocle'::
Remove borders for tiled windows in monocle mode. Remove borders for tiled windows in monocle mode.

6
ewmh.c
View file

@ -15,12 +15,6 @@ void ewmh_init(void)
err("Can't initialize EWMH atoms.\n"); err("Can't initialize EWMH atoms.\n");
} }
void ewmh_update_wm_name(void)
{
if (wm_name != NULL)
xcb_ewmh_set_wm_name(ewmh, root, strlen(wm_name), wm_name);
}
void ewmh_update_active_window(void) void ewmh_update_active_window(void)
{ {
xcb_window_t win = (mon->desk->focus == NULL ? XCB_NONE : mon->desk->focus->client->window); xcb_window_t win = (mon->desk->focus == NULL ? XCB_NONE : mon->desk->focus->client->window);

1
ewmh.h
View file

@ -6,7 +6,6 @@
xcb_ewmh_connection_t *ewmh; xcb_ewmh_connection_t *ewmh;
void ewmh_init(void); void ewmh_init(void);
void ewmh_update_wm_name(void);
void ewmh_update_active_window(void); void ewmh_update_active_window(void);
void ewmh_update_number_of_desktops(void); void ewmh_update_number_of_desktops(void);
uint32_t ewmh_get_desktop_index(desktop_t *); uint32_t ewmh_get_desktop_index(desktop_t *);

View file

@ -734,10 +734,6 @@ bool set_setting(char *name, char *value)
SETBOOL(auto_cancel) SETBOOL(auto_cancel)
SETBOOL(history_aware_focus) SETBOOL(history_aware_focus)
#undef SETBOOL #undef SETBOOL
} else if (streq("wm_name", name)) {
strncpy(wm_name, value, sizeof(wm_name));
ewmh_update_wm_name();
return true;
} else { } else {
return false; return false;
} }
@ -782,8 +778,6 @@ bool get_setting(char *name, char* rsp)
GETBOOL(auto_cancel) GETBOOL(auto_cancel)
GETBOOL(history_aware_focus) GETBOOL(history_aware_focus)
#undef GETBOOL #undef GETBOOL
else if (streq("wm_name", name))
snprintf(rsp, BUFSIZ, "%s", wm_name);
else else
return false; return false;
return true; return true;

View file

@ -37,8 +37,6 @@ void load_settings(void)
strncpy(normal_locked_border_color, NORMAL_LOCKED_BORDER_COLOR, sizeof(normal_locked_border_color)); strncpy(normal_locked_border_color, NORMAL_LOCKED_BORDER_COLOR, sizeof(normal_locked_border_color));
strncpy(urgent_border_color, URGENT_BORDER_COLOR, sizeof(urgent_border_color)); strncpy(urgent_border_color, URGENT_BORDER_COLOR, sizeof(urgent_border_color));
strncpy(wm_name, WM_NAME, sizeof(wm_name));
border_width = BORDER_WIDTH; border_width = BORDER_WIDTH;
window_gap = WINDOW_GAP; window_gap = WINDOW_GAP;
split_ratio = SPLIT_RATIO; split_ratio = SPLIT_RATIO;

View file

@ -53,8 +53,6 @@ bool auto_alternate;
bool auto_cancel; bool auto_cancel;
bool history_aware_focus; bool history_aware_focus;
char wm_name[MAXLEN];
void load_settings(void); void load_settings(void);
void run_config(void); void run_config(void);

View file

@ -3,7 +3,7 @@
_bspc() { _bspc() {
local -a commands settings local -a commands settings
commands=('window' 'desktop' 'monitor' 'query' 'pointer' 'rule' 'restore' 'control' 'config' 'quit') 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' 'urgent_border_color' 'border_width' 'window_gap' 'split_ratio' 'wm_name' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'adaptative_raise' 'apply_shadow_property' 'auto_alternate' 'auto_cancel' 'history_aware_focus') 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' 'urgent_border_color' 'border_width' 'window_gap' 'split_ratio' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'adaptative_raise' 'apply_shadow_property' 'auto_alternate' 'auto_cancel' 'history_aware_focus')
if (( CURRENT == 2 )) ; then if (( CURRENT == 2 )) ; then
_values 'command' "$commands[@]" _values 'command' "$commands[@]"
elif (( CURRENT == 3 )) ; then elif (( CURRENT == 3 )) ; then