mainnika
/
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>
dev
Daniel Stone 8 years ago
parent 8de91494b3
commit 08cf24bc2d
1 changed files with 12 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      clients/desktop-shell.c

23
clients/desktop-shell.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save