summaryrefslogtreecommitdiff
path: root/clients/fullscreen.c
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-11-11 19:04:29 -0500
committerKristian Høgsberg <krh@bitplanet.net>2014-02-01 01:43:02 -0800
commit76ec0826bc390010b347da28985e68f5252f2f95 (patch)
treefd86f55523f2fe41c3123dc658d203001b47a01b /clients/fullscreen.c
parent7f4386e90a64a1a478730ca9f7f30b998d8ac36b (diff)
downloadweston-76ec0826bc390010b347da28985e68f5252f2f95.tar.gz
westoy: Remove fullscreen methods
These aren't supported under xdg_shell, at least not right now. If xdg_shell ever gets support for them, we can revert this commit and adapt it.
Diffstat (limited to 'clients/fullscreen.c')
-rw-r--r--clients/fullscreen.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/clients/fullscreen.c b/clients/fullscreen.c
index 034a3528..46a79266 100644
--- a/clients/fullscreen.c
+++ b/clients/fullscreen.c
@@ -40,7 +40,6 @@ struct fullscreen {
int width, height;
int fullscreen;
float pointer_x, pointer_y;
- enum wl_shell_surface_fullscreen_method fullscreen_method;
};
static void
@@ -114,7 +113,6 @@ redraw_handler(struct widget *widget, void *data)
cairo_t *cr;
int i;
double x, y, border;
- const char *method_name[] = { "default", "scale", "driver", "fill" };
surface = window_get_surface(fullscreen->window);
if (surface == NULL ||
@@ -144,13 +142,13 @@ redraw_handler(struct widget *widget, void *data)
"Surface size: %d, %d\n"
"Scale: %d, transform: %d\n"
"Pointer: %f,%f\n"
- "Fullscreen: %d, method: %s\n"
- "Keys: (s)cale, (t)ransform, si(z)e, (m)ethod, (f)ullscreen, (q)uit\n",
+ "Fullscreen: %d\n"
+ "Keys: (s)cale, (t)ransform, si(z)e, (f)ullscreen, (q)uit\n",
fullscreen->width, fullscreen->height,
window_get_buffer_scale (fullscreen->window),
window_get_buffer_transform (fullscreen->window),
fullscreen->pointer_x, fullscreen->pointer_y,
- fullscreen->fullscreen, method_name[fullscreen->fullscreen_method]);
+ fullscreen->fullscreen);
y = 100;
i = 0;
@@ -222,13 +220,6 @@ key_handler(struct window *window, struct input *input, uint32_t time,
fullscreen->width, fullscreen->height);
break;
- case XKB_KEY_m:
- fullscreen->fullscreen_method = (fullscreen->fullscreen_method + 1) % 4;
- window_set_fullscreen_method(fullscreen->window,
- fullscreen->fullscreen_method);
- window_schedule_redraw(window);
- break;
-
case XKB_KEY_f:
fullscreen->fullscreen ^= 1;
window_set_fullscreen(window, fullscreen->fullscreen);
@@ -306,8 +297,6 @@ int main(int argc, char *argv[])
fullscreen.width = 640;
fullscreen.height = 480;
fullscreen.fullscreen = 0;
- fullscreen.fullscreen_method =
- WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT;
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-w") == 0) {
@@ -338,8 +327,6 @@ int main(int argc, char *argv[])
window_add_widget(fullscreen.window, &fullscreen);
window_set_title(fullscreen.window, "Fullscreen");
- window_set_fullscreen_method(fullscreen.window,
- fullscreen.fullscreen_method);
widget_set_transparent(fullscreen.widget, 0);
widget_set_default_cursor(fullscreen.widget, CURSOR_LEFT_PTR);