mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-15 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients/view: Allow relative paths

Browse source
This commit is contained in:
Tim Wiederhake 2011-01-25 22:21:58 +01:00 • committed by Kristian Høgsberg
parent 655467a5d2
commit 9aad08e91b
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
clients/view.c
View file

@ -193,6 +193,7 @@ view_create(struct display *display, uint32_t key, const char *filename)
struct view *view; struct view *view;
gchar *basename; gchar *basename;
gchar *title; gchar *title;
GFile *file = NULL;
GError *error = NULL; GError *error = NULL;
view = malloc(sizeof *view); view = malloc(sizeof *view);
@ -200,9 +201,22 @@ view_create(struct display *display, uint32_t key, const char *filename)
return view; return view;
memset(view, 0, sizeof *view); memset(view, 0, sizeof *view);
basename = g_path_get_basename(filename); file = g_file_new_for_commandline_arg(filename);
basename = g_file_get_basename(file);
if(!basename) {
title = "Wayland View";
} else {
title = g_strdup_printf("Wayland View - %s", basename); title = g_strdup_printf("Wayland View - %s", basename);
g_free(basename); g_free(basename);
}
view->document = poppler_document_new_from_file(g_file_get_uri(file),
NULL, &error);
if(error) {
title = "File not found";
view->document = NULL;
}
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);
@ -214,8 +228,6 @@ view_create(struct display *display, uint32_t key, const char *filename)
window_set_keyboard_focus_handler(view->window, window_set_keyboard_focus_handler(view->window,
keyboard_focus_handler); keyboard_focus_handler);
window_set_button_handler(view->window, button_handler); window_set_button_handler(view->window, button_handler);
view->document = poppler_document_new_from_file(filename,
NULL, &error);
view->page = 0; view->page = 0;
view_draw(view); view_draw(view);