Add an image viewer client
This commit is contained in:
Chris Wilson
Kristian Høgsberg
parent
5544491240
commit
0de19eb688
14
Makefile.in
14
Makefile.in
@ -5,10 +5,11 @@ exec_prefix = @exec_prefix@
|
||||
udev_rules_dir = @sysconfdir@/udev/rules.d
|
||||
|
||||
libs = libwayland-server.so libwayland.so
|
||||
clients = flower gears screenshot terminal
|
||||
egl_clients = gears
|
||||
cairo_clients = flower screenshot terminal image
|
||||
compositors = wayland-system-compositor
|
||||
|
||||
all : $(libs) $(compositors) $(clients)
|
||||
all : $(libs) $(compositors) $(egl_clients) $(cairo_clients)
|
||||
|
||||
libwayland-server.so : \
|
||||
wayland.o \
|
||||
@ -41,11 +42,16 @@ flower : flower.o wayland-glib.o
|
||||
gears : gears.o window.o wayland-glib.o cairo-util.o
|
||||
screenshot : screenshot.o wayland-glib.o
|
||||
terminal : terminal.o window.o wayland-glib.o cairo-util.o
|
||||
image : image.o window.o wayland-glib.o cairo-util.o
|
||||
|
||||
terminal : LDLIBS += -lutil
|
||||
image : CFLAGS += @GDK_PIXBUF_CFLAGS@
|
||||
image : LDLIBS += @GDK_PIXBUF_LIBS@
|
||||
|
||||
$(clients) : CFLAGS += @CLIENT_CFLAGS@
|
||||
$(clients) : LDLIBS += -L. -lwayland @CLIENT_LIBS@ -lrt
|
||||
$(egl_clients) : CFLAGS += @EGL_CLIENT_CFLAGS@
|
||||
$(egl_clients) : LDLIBS += -L. -lwayland @EGL_CLIENT_LIBS@ -lrt
|
||||
$(cairo_clients) : CFLAGS += @CAIRO_CLIENT_CFLAGS@
|
||||
$(cairo_clients) : LDLIBS += -L. -lwayland @CAIRO_CLIENT_LIBS@ -lrt
|
||||
|
||||
install : $(libs) $(compositors)
|
||||
install -d @libdir@ @libdir@/pkgconfig ${udev_rules_dir}
|
||||
|
||||
@ -6,7 +6,9 @@ PKG_CHECK_MODULES(FFI, [libffi])
|
||||
|
||||
PKG_CHECK_MODULES(EGL_COMPOSITOR,
|
||||
[eagle libpng cairo gdk-pixbuf-2.0 libudev >= 136 libdrm])
|
||||
PKG_CHECK_MODULES(CLIENT, [eagle cairo glib-2.0 libudev])
|
||||
PKG_CHECK_MODULES(EGL_CLIENT, [eagle cairo glib-2.0 libudev])
|
||||
PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0])
|
||||
PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0])
|
||||
|
||||
if test $CC = gcc; then
|
||||
GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
|
||||
|
||||
336
image.c
Normal file
336
image.c
Normal file
@ -0,0 +1,336 @@
|
||||
/*
|
||||
* Copyright © 2008 Kristian Høgsberg
|
||||
* Copyright © 2009 Chris Wilson
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that copyright
|
||||
* notice and this permission notice appear in supporting documentation, and
|
||||
* that the name of the copyright holders not be used in advertising or
|
||||
* publicity pertaining to distribution of the software without specific,
|
||||
* written prior permission. The copyright holders make no representations
|
||||
* about the suitability of this software for any purpose. It is provided "as
|
||||
* is" without express or implied warranty.
|
||||
*
|
||||
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
#include <cairo.h>
|
||||
#include <cairo-drm.h>
|
||||
#include <glib.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
#include "wayland-client.h"
|
||||
#include "wayland-glib.h"
|
||||
|
||||
#include "window.h"
|
||||
|
||||
static const char gem_device[] = "/dev/dri/card0";
|
||||
static const char socket_name[] = "\0wayland";
|
||||
|
||||
struct image {
|
||||
struct window *window;
|
||||
struct display *display;
|
||||
struct wl_compositor *compositor;
|
||||
uint32_t key;
|
||||
|
||||
gboolean redraw_scheduled;
|
||||
gboolean redraw_pending;
|
||||
|
||||
cairo_surface_t *surface;
|
||||
gchar *filename;
|
||||
};
|
||||
|
||||
static void
|
||||
set_source_pixbuf(cairo_t *cr,
|
||||
const GdkPixbuf *pixbuf,
|
||||
double src_x,
|
||||
double src_y,
|
||||
double src_width,
|
||||
double src_height)
|
||||
{
|
||||
gint width = gdk_pixbuf_get_width (pixbuf);
|
||||
gint height = gdk_pixbuf_get_height (pixbuf);
|
||||
guchar *gdk_pixels = gdk_pixbuf_get_pixels (pixbuf);
|
||||
int gdk_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
|
||||
int n_channels = gdk_pixbuf_get_n_channels (pixbuf);
|
||||
int cairo_stride;
|
||||
guchar *cairo_pixels;
|
||||
cairo_format_t format;
|
||||
cairo_surface_t *surface;
|
||||
int j;
|
||||
|
||||
if (n_channels == 3)
|
||||
format = CAIRO_FORMAT_RGB24;
|
||||
else
|
||||
format = CAIRO_FORMAT_ARGB32;
|
||||
|
||||
surface = cairo_image_surface_create(format, width, height);
|
||||
if (cairo_surface_status(surface)) {
|
||||
cairo_set_source_surface(cr, surface, 0, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
cairo_stride = cairo_image_surface_get_stride(surface);
|
||||
cairo_pixels = cairo_image_surface_get_data(surface);
|
||||
|
||||
for (j = height; j; j--) {
|
||||
guchar *p = gdk_pixels;
|
||||
guchar *q = cairo_pixels;
|
||||
|
||||
if (n_channels == 3) {
|
||||
guchar *end = p + 3 * width;
|
||||
|
||||
while (p < end) {
|
||||
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
q[0] = p[2];
|
||||
q[1] = p[1];
|
||||
q[2] = p[0];
|
||||
#else
|
||||
q[1] = p[0];
|
||||
q[2] = p[1];
|
||||
q[3] = p[2];
|
||||
#endif
|
||||
p += 3;
|
||||
q += 4;
|
||||
}
|
||||
} else {
|
||||
guchar *end = p + 4 * width;
|
||||
guint t1,t2,t3;
|
||||
|
||||
#define MULT(d,c,a,t) G_STMT_START { t = c * a + 0x7f; d = ((t >> 8) + t) >> 8; } G_STMT_END
|
||||
|
||||
while (p < end) {
|
||||
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
MULT(q[0], p[2], p[3], t1);
|
||||
MULT(q[1], p[1], p[3], t2);
|
||||
MULT(q[2], p[0], p[3], t3);
|
||||
q[3] = p[3];
|
||||
#else
|
||||
q[0] = p[3];
|
||||
MULT(q[1], p[0], p[3], t1);
|
||||
MULT(q[2], p[1], p[3], t2);
|
||||
MULT(q[3], p[2], p[3], t3);
|
||||
#endif
|
||||
|
||||
p += 4;
|
||||
q += 4;
|
||||
}
|
||||
#undef MULT
|
||||
}
|
||||
|
||||
gdk_pixels += gdk_rowstride;
|
||||
cairo_pixels += cairo_stride;
|
||||
}
|
||||
cairo_surface_mark_dirty(surface);
|
||||
|
||||
cairo_set_source_surface(cr, surface,
|
||||
src_x + .5 * (src_width - width),
|
||||
src_y + .5 * (src_height - height));
|
||||
cairo_surface_destroy(surface);
|
||||
}
|
||||
|
||||
static void
|
||||
image_draw(struct image *image)
|
||||
{
|
||||
struct rectangle rectangle;
|
||||
GdkPixbuf *pb;
|
||||
cairo_t *cr;
|
||||
|
||||
image->redraw_pending = 0;
|
||||
|
||||
window_draw(image->window);
|
||||
|
||||
window_get_child_rectangle(image->window, &rectangle);
|
||||
|
||||
pb = gdk_pixbuf_new_from_file_at_size(image->filename,
|
||||
rectangle.width,
|
||||
rectangle.height,
|
||||
NULL);
|
||||
if (pb == NULL)
|
||||
return;
|
||||
|
||||
image->surface =
|
||||
window_create_surface(image->window, &rectangle);
|
||||
|
||||
cr = cairo_create(image->surface);
|
||||
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
|
||||
cairo_set_source_rgba(cr, 0, 0, 0, 1);
|
||||
cairo_paint(cr);
|
||||
set_source_pixbuf(cr, pb,
|
||||
0, 0,
|
||||
rectangle.width, rectangle.height);
|
||||
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
|
||||
cairo_paint(cr);
|
||||
cairo_destroy(cr);
|
||||
|
||||
g_object_unref(pb);
|
||||
|
||||
window_copy_surface(image->window,
|
||||
&rectangle,
|
||||
image->surface);
|
||||
|
||||
wl_compositor_commit(image->compositor, image->key);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
image_idle_redraw(void *data)
|
||||
{
|
||||
struct image *image = data;
|
||||
|
||||
image_draw(image);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
image_schedule_redraw(struct image *image)
|
||||
{
|
||||
if (!image->redraw_scheduled) {
|
||||
image->redraw_scheduled = 1;
|
||||
g_idle_add(image_idle_redraw, image);
|
||||
} else {
|
||||
image->redraw_pending = 1;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
resize_handler(struct window *window, void *data)
|
||||
{
|
||||
struct image *image = data;
|
||||
|
||||
image_schedule_redraw(image);
|
||||
}
|
||||
|
||||
static void
|
||||
handle_acknowledge(void *data,
|
||||
struct wl_compositor *compositor,
|
||||
uint32_t key, uint32_t frame)
|
||||
{
|
||||
struct image *image = data;
|
||||
|
||||
if (image->key != key)
|
||||
return;
|
||||
|
||||
cairo_surface_destroy(image->surface);
|
||||
image->redraw_scheduled = 0;
|
||||
if (image->redraw_pending) {
|
||||
image->redraw_pending = 0;
|
||||
image_schedule_redraw(image);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
handle_frame(void *data,
|
||||
struct wl_compositor *compositor,
|
||||
uint32_t frame, uint32_t timestamp)
|
||||
{
|
||||
}
|
||||
|
||||
static const struct wl_compositor_listener compositor_listener = {
|
||||
handle_acknowledge,
|
||||
handle_frame,
|
||||
};
|
||||
|
||||
static struct image *
|
||||
image_create(struct display *display, uint32_t key, const char *filename)
|
||||
{
|
||||
struct image *image;
|
||||
gchar *basename;
|
||||
gchar *title;
|
||||
|
||||
image = malloc(sizeof *image);
|
||||
if (image == NULL)
|
||||
return image;
|
||||
memset(image, 0, sizeof *image);
|
||||
|
||||
basename = g_path_get_basename(filename);
|
||||
title = g_strdup_printf("Wayland Image - %s", basename);
|
||||
g_free(basename);
|
||||
|
||||
image->filename = g_strdup(filename);
|
||||
|
||||
image->window = window_create(display, title, 100 * key, 100 * key, 500, 400);
|
||||
image->display = display;
|
||||
|
||||
/* FIXME: Window uses key 1 for moves, need some kind of
|
||||
* allocation scheme here. Or maybe just a real toolkit. */
|
||||
image->key = key + 100;
|
||||
image->redraw_scheduled = 1;
|
||||
|
||||
image->compositor = display_get_compositor(display);
|
||||
window_set_resize_handler(image->window, resize_handler, image);
|
||||
|
||||
wl_compositor_add_listener(image->compositor, &compositor_listener, image);
|
||||
|
||||
image_draw(image);
|
||||
|
||||
return image;
|
||||
}
|
||||
|
||||
static const GOptionEntry option_entries[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
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 ();
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
struct image *image;
|
||||
|
||||
image = image_create (d, i, argv[i]);
|
||||
}
|
||||
|
||||
g_main_loop_run(loop);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user