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

shell: Add missing cases to switch statements for surface types

Browse Source 
This fixes a load of GCC warnings when compiling with -Wswitch-enum
-Wswitch-default, and makes it clearer that those cases have been
thought about explicitly when writing the code, rather than just being
forgotten.
This commit is contained in:
Philip Withnall 2013-11-25 18:01:31 +00:00 committed by Kristian Høgsberg
parent becb77e211
commit 0f640e219c
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/shell.c
View File

@ -2259,6 +2259,7 @@ reset_surface_type(struct shell_surface *surface)
case SHELL_SURFACE_TRANSIENT: case SHELL_SURFACE_TRANSIENT:
case SHELL_SURFACE_POPUP: case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_XWAYLAND: case SHELL_SURFACE_XWAYLAND:
default:
break; break;
} }
@ -2306,6 +2307,8 @@ set_surface_type(struct shell_surface *shsurf)
shsurf->transient.y); shsurf->transient.y);
break; break;
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_NONE:
default: default:
break; break;
} }
@ -3833,6 +3836,12 @@ activate(struct desktop_shell *shell, struct weston_surface *es,
shell_stack_fullscreen(get_shell_surface(main_surface)); shell_stack_fullscreen(get_shell_surface(main_surface));
shell_configure_fullscreen(get_shell_surface(main_surface)); shell_configure_fullscreen(get_shell_surface(main_surface));
return; return;
case SHELL_SURFACE_TOPLEVEL:
case SHELL_SURFACE_TRANSIENT:
case SHELL_SURFACE_MAXIMIZED:
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_XWAYLAND:
case SHELL_SURFACE_NONE:
default: default:
restore_all_output_modes(shell->compositor); restore_all_output_modes(shell->compositor);
ws = get_current_workspace(shell); ws = get_current_workspace(shell);
@ -4301,6 +4310,8 @@ map(struct desktop_shell *shell, struct shell_surface *shsurf,
shsurf->view->geometry.x + sx, shsurf->view->geometry.x + sx,
shsurf->view->geometry.y + sy); shsurf->view->geometry.y + sy);
break; break;
case SHELL_SURFACE_TRANSIENT:
case SHELL_SURFACE_XWAYLAND:
default: default:
; ;
} }
@ -4321,6 +4332,8 @@ map(struct desktop_shell *shell, struct shell_surface *shsurf,
case SHELL_SURFACE_NONE: case SHELL_SURFACE_NONE:
break; break;
case SHELL_SURFACE_XWAYLAND: case SHELL_SURFACE_XWAYLAND:
case SHELL_SURFACE_TOPLEVEL:
case SHELL_SURFACE_MAXIMIZED:
default: default:
ws = get_current_workspace(shell); ws = get_current_workspace(shell);
wl_list_remove(&shsurf->view->layer_link); wl_list_remove(&shsurf->view->layer_link);
@ -4351,6 +4364,8 @@ map(struct desktop_shell *shell, struct shell_surface *shsurf,
activate(shell, shsurf->surface, seat); activate(shell, shsurf->surface, seat);
} }
break; break;
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_NONE:
default: default:
break; break;
} }
@ -4404,7 +4419,10 @@ configure(struct desktop_shell *shell, struct weston_surface *surface,
get_output_panel_height(shell,shsurf->output) - surf_y; get_output_panel_height(shell,shsurf->output) - surf_y;
break; break;
case SHELL_SURFACE_TOPLEVEL: case SHELL_SURFACE_TOPLEVEL:
break; case SHELL_SURFACE_TRANSIENT:
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_XWAYLAND:
case SHELL_SURFACE_NONE:
default: default:
break; break;
} }
@ -4884,6 +4902,10 @@ switcher_next(struct switcher *switcher)
weston_view_geometry_dirty(view); weston_view_geometry_dirty(view);
weston_surface_damage(view->surface); weston_surface_damage(view->surface);
break; break;
case SHELL_SURFACE_TRANSIENT:
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_XWAYLAND:
case SHELL_SURFACE_NONE:
default: default:
break; break;
} }