clients/view: Remove unnecessary variables

This commit is contained in:
Tim Wiederhake 2011-01-25 22:21:56 +01:00 committed by Kristian Høgsberg
parent 1afc9a98fa
commit 7e182ef13b
1 changed files with 1 additions and 12 deletions

View File

@ -45,13 +45,10 @@
struct view { struct view {
struct window *window; struct window *window;
struct display *display; struct display *display;
uint32_t key;
gchar *filename;
PopplerDocument *document; PopplerDocument *document;
int page; int page;
int fullscreen; int fullscreen;
int focused;
}; };
static void static void
@ -153,8 +150,6 @@ keyboard_focus_handler(struct window *window,
struct input *device, void *data) struct input *device, void *data)
{ {
struct view *view = data; struct view *view = data;
view->focused = (device != NULL);
window_schedule_redraw(view->window); window_schedule_redraw(view->window);
} }
@ -175,23 +170,17 @@ view_create(struct display *display, uint32_t key, const char *filename)
title = g_strdup_printf("Wayland View - %s", basename); title = g_strdup_printf("Wayland View - %s", basename);
g_free(basename); g_free(basename);
view->filename = g_strdup(filename);
view->window = window_create(display, 500, 400); view->window = window_create(display, 500, 400);
window_set_title(view->window, title); window_set_title(view->window, title);
view->display = display; view->display = display;
/* FIXME: Window uses key 1 for moves, need some kind of
* allocation scheme here. Or maybe just a real toolkit. */
view->key = key + 100;
window_set_user_data(view->window, view); window_set_user_data(view->window, view);
window_set_redraw_handler(view->window, redraw_handler); window_set_redraw_handler(view->window, redraw_handler);
window_set_key_handler(view->window, key_handler); window_set_key_handler(view->window, key_handler);
window_set_keyboard_focus_handler(view->window, window_set_keyboard_focus_handler(view->window,
keyboard_focus_handler); keyboard_focus_handler);
view->document = poppler_document_new_from_file(view->filename, view->document = poppler_document_new_from_file(filename,
NULL, &error); NULL, &error);
view->page = 0; view->page = 0;
view_draw(view); view_draw(view);