mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-09 13:29:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate more code in clients/window.c

Browse source
This commit is contained in:
Kristian Høgsberg 2010-06-08 14:59:44 -04:00
parent a85fe3cf45
commit 7824d81e07
7 changed files with 73 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

34
clients/image.c
View file

@ -299,40 +299,10 @@ static const GOptionEntry option_entries[] = {
int
main(int argc, char *argv[])
{
struct wl_display *display;
int fd;
GMainLoop *loop;
GSource *source;
struct display *d;
GOptionContext *context;
GError *error;
int i;
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, option_entries, "Wayland Image");
if (!g_option_context_parse(context, &argc, &argv, &error)) {
fprintf(stderr, "option parsing failed: %s\n", error->message);
exit(EXIT_FAILURE);
}
fd = open(gem_device, O_RDWR);
if (fd < 0) {
fprintf(stderr, "drm open failed: %m\n");
return -1;
}
display = wl_display_create(socket_name, sizeof socket_name);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
}
d = display_create(display, fd);
loop = g_main_loop_new(NULL, FALSE);
source = wl_glib_source_new(display);
g_source_attach(source, NULL);
g_type_init ();
d = display_create(&argc, &argv, option_entries);
for (i = 1; i < argc; i++) {
struct image *image;
@ -340,7 +310,7 @@ main(int argc, char *argv[])
image = image_create (d, i, argv[i]);
}
g_main_loop_run(loop);
display_run(d);
return 0;
}