mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Support panel-position 'none'

Browse Source 
The manpage claims that none is valid, so let's make it so.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Daniel Stone 2017-01-16 13:18:21 +00:00
parent 8de91494b3
commit 08cf24bc2d
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
clients/desktop-shell.c
View File

@ -1362,25 +1362,24 @@ parse_panel_position(struct desktop *desktop, struct weston_config_section *s)
{
char *position;
weston_config_section_get_string(s, "panel-position", &position, "top");
if (strcmp(position, "top") == 0)
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP;
else if (strcmp(position, "bottom") == 0)
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
else if (strcmp(position, "left") == 0)
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_LEFT;
else if (strcmp(position, "right") == 0)
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_RIGHT;
else
fprintf(stderr, "Wrong panel position: %s\n", position);
free(position);
desktop->want_panel = 1;
if (desktop->panel_position == WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP
|| desktop->panel_position == WESTON_DESKTOP_SHELL_PANEL_POSITION_BOTTOM
|| desktop->panel_position == WESTON_DESKTOP_SHELL_PANEL_POSITION_LEFT
|| desktop->panel_position == WESTON_DESKTOP_SHELL_PANEL_POSITION_RIGHT) {
desktop->want_panel = 1;
weston_config_section_get_string(s, "panel-position", &position, "top");
if (strcmp(position, "top") == 0) {
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP;
} else if (strcmp(position, "bottom") == 0) {
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
} else if (strcmp(position, "left") == 0) {
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_LEFT;
} else if (strcmp(position, "right") == 0) {
desktop->panel_position = WESTON_DESKTOP_SHELL_PANEL_POSITION_RIGHT;
} else {
/* 'none' is valid here */
if (strcmp(position, "none") != 0)
fprintf(stderr, "Wrong panel position: %s\n", position);
desktop->want_panel = 0;
}
free(position);
}
static void