clients: Add a simple desktop-shell app

This just provides the background surface and the top panel.
dev
Kristian Høgsberg 13 years ago
parent 900b226ac1
commit 0c29eb292e
  1. 16
      clients/Makefile.am
  2. 392
      clients/desktop-shell.c
  3. 45
      clients/window.c
  4. 9
      clients/window.h

@ -12,7 +12,8 @@ simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS)
endif endif
if BUILD_CLIENTS if BUILD_CLIENTS
clients_programs = gears \ clients_programs = \
gears \
flower \ flower \
screenshot \ screenshot \
terminal \ terminal \
@ -20,7 +21,8 @@ clients_programs = gears \
dnd \ dnd \
smoke \ smoke \
resizor \ resizor \
eventdemo eventdemo \
desktop-shell
noinst_LIBRARIES = libtoytoolkit.a noinst_LIBRARIES = libtoytoolkit.a
@ -68,9 +70,17 @@ resizor_LDADD = $(toolkit_libs)
eventdemo_SOURCES = eventdemo.c eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = $(toolkit_libs) eventdemo_LDADD = $(toolkit_libs)
desktop_shell_SOURCES = \
desktop-shell.c \
desktop-shell-client-protocol.h \
desktop-shell-protocol.c
desktop_shell_LDADD = $(toolkit_libs)
BUILT_SOURCES = \ BUILT_SOURCES = \
screenshooter-client-protocol.h \ screenshooter-client-protocol.h \
screenshooter-protocol.c screenshooter-protocol.c \
desktop-shell-client-protocol.h \
desktop-shell-protocol.c
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
endif endif

@ -0,0 +1,392 @@
/*
* Copyright © 2011 Kristian Høgsberg
*
* 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 <cairo.h>
#include <sys/wait.h>
#include <linux/input.h>
#include "wayland-client.h"
#include "wayland-glib.h"
#include "window.h"
#include <desktop-shell-client-protocol.h>
struct desktop {
struct display *display;
struct desktop_shell *shell;
struct panel *panel;
struct window *background;
const char *background_path;
};
struct panel {
struct window *window;
struct wl_list item_list;
struct panel_item *focus;
};
struct panel_item {
struct wl_list link;
cairo_surface_t *icon;
int x, y, width, height;
int pressed;
const char *path;
};
static void
sigchild_handler(int s)
{
int status;
pid_t pid;
while (pid = waitpid(-1, &status, WNOHANG), pid > 0)
fprintf(stderr, "child %d exited\n", pid);
}
static void
panel_activate_item(struct panel *panel, struct panel_item *item)
{
pid_t pid;
pid = fork();
if (pid < 0) {
fprintf(stderr, "fork failed: %m\n");
return;
}
if (pid)
return;
if (execl(item->path, item->path, NULL) < 0) {
fprintf(stderr, "execl failed: %m\n");
exit(1);
}
}
static struct panel_item *
panel_find_item(struct panel *panel, int32_t x, int32_t y)
{
struct panel_item *item;
wl_list_for_each(item, &panel->item_list, link) {
if (item->x <= x && x < item->x + item->width &&
item->y <= y && y < item->y + item->height) {
return item;
}
}
return NULL;
}
static void
panel_draw_item(struct panel *panel, cairo_t *cr, struct panel_item *item)
{
int x, y;
if (item->pressed) {
x = item->x + 1;
y = item->y + 1;
} else {
x = item->x;
y = item->y;
}
cairo_set_source_surface(cr, item->icon, x, y);
cairo_paint(cr);
if (panel->focus == item) {
cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.4);
cairo_mask_surface(cr, item->icon, x, y);
}
}
static void
panel_redraw_handler(struct window *window, void *data)
{
cairo_surface_t *surface;
cairo_t *cr;
struct panel *panel = window_get_user_data(window);
struct panel_item *item;
window_draw(window);
surface = window_get_surface(window);
cr = cairo_create(surface);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.9);
cairo_paint(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
wl_list_for_each(item, &panel->item_list, link)
panel_draw_item(panel, cr, item);
cairo_destroy(cr);
cairo_surface_destroy(surface);
window_flush(window);
}
static void
panel_set_focus(struct panel *panel, struct panel_item *focus)
{
if (focus == panel->focus)
return;
panel->focus = focus;
window_schedule_redraw(panel->window);
}
static int
panel_enter_handler(struct window *window,
struct input *input, uint32_t time,
int32_t x, int32_t y, void *data)
{
struct panel *panel = data;
struct panel_item *item;
item = panel_find_item(panel, x, y);
panel_set_focus(panel, item);
return POINTER_LEFT_PTR;
}
static void
panel_leave_handler(struct window *window,
struct input *input, uint32_t time, void *data)
{
struct panel *panel = data;
panel_set_focus(panel, NULL);
}
static int
panel_motion_handler(struct window *window,
struct input *input, uint32_t time,
int32_t x, int32_t y,
int32_t sx, int32_t sy, void *data)
{
struct panel *panel = data;
struct panel_item *item;
if (panel->focus && panel->focus->pressed)
return POINTER_LEFT_PTR;
item = panel_find_item(panel, sx, sy);
panel_set_focus(panel, item);
return POINTER_LEFT_PTR;
}
static void
panel_button_handler(struct window *window,
struct input *input, uint32_t time,
int button, int state, void *data)
{
struct panel *panel = data;
struct panel_item *item;
int32_t x, y;
if (panel->focus && button == BTN_LEFT) {
panel->focus->pressed = state;
window_schedule_redraw(panel->window);
if (state == 0) {
panel_activate_item(panel, panel->focus);
input_get_position(input, &x, &y);
item = panel_find_item(panel, x, y);
panel_set_focus(panel, item);
}
}
}
static struct panel *
panel_create(struct display *display)
{
struct panel *panel;
panel = malloc(sizeof *panel);
memset(panel, 0, sizeof *panel);
wl_list_init(&panel->item_list);
panel->window = window_create(display, 0, 0);
window_set_title(panel->window, "panel");
window_set_decoration(panel->window, 0);
window_set_redraw_handler(panel->window, panel_redraw_handler);
window_set_custom(panel->window);
window_set_user_data(panel->window, panel);
window_set_enter_handler(panel->window, panel_enter_handler);
window_set_leave_handler(panel->window, panel_leave_handler);
window_set_motion_handler(panel->window, panel_motion_handler);
window_set_button_handler(panel->window, panel_button_handler);
return panel;
}
static void
panel_add_item(struct panel *panel, const char *icon, const char *path)
{
struct panel_item *item;
item = malloc(sizeof *item);
memset(item, 0, sizeof *item);
item->icon = cairo_image_surface_create_from_png(icon);
item->path = strdup(path);
wl_list_insert(panel->item_list.prev, &item->link);
item->width = cairo_image_surface_get_width(item->icon);
item->height = cairo_image_surface_get_height(item->icon);
}
static void
panel_allocate(struct panel *panel, int width, int height)
{
struct panel_item *item;
int x;
window_set_child_size(panel->window, width, height);
window_schedule_redraw(panel->window);
x = 10;
wl_list_for_each(item, &panel->item_list, link) {
item->x = x;
item->y = (height - item->height) / 2;
x += item->width + 10;
}
}
static void
background_draw(struct window *window, int width, int height, const char *path)
{
cairo_surface_t *surface, *image;
cairo_t *cr;
window_set_child_size(window, width, height);
window_draw(window);
surface = window_get_surface(window);
cr = cairo_create(surface);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0.0, 0.0, 0.2, 1.0);
cairo_paint(cr);
if (path) {
image = cairo_image_surface_create_from_png(path);
cairo_set_source_surface(cr, image, 0, 0);
cairo_paint(cr);
}
cairo_destroy(cr);
cairo_surface_destroy(surface);
window_flush(window);
}
static void
desktop_shell_configure(void *data,
struct desktop_shell *desktop_shell,
uint32_t time, uint32_t edges,
struct wl_surface *surface,
int32_t width, int32_t height)
{
struct desktop *desktop = data;
if (surface == window_get_wl_surface(desktop->panel->window)) {
panel_allocate(desktop->panel, width, 32);
} else if (surface == window_get_wl_surface(desktop->background)) {
background_draw(desktop->background,
width, height, desktop->background_path);
}
}
static const struct desktop_shell_listener listener = {
desktop_shell_configure
};
static void
global_handler(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data)
{
struct desktop *desktop = data;
if (!strcmp(interface, "desktop_shell")) {
desktop->shell =
wl_display_bind(display, id, &desktop_shell_interface);
desktop_shell_add_listener(desktop->shell, &listener, desktop);
}
}
static const struct {
const char *icon;
const char *path;
} launchers[] = {
{
"/usr/share/icons/gnome/24x24/apps/utilities-terminal.png",
"/usr/bin/gnome-terminal"
},
{
"/usr/share/icons/hicolor/24x24/apps/google-chrome.png",
"/usr/bin/google-chrome"
},
};
int main(int argc, char *argv[])
{
struct desktop desktop;
int i;
desktop.display = display_create(&argc, &argv, NULL);
if (desktop.display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
}
wl_display_add_global_listener(display_get_display(desktop.display),
global_handler, &desktop);
desktop.panel = panel_create(desktop.display);
for (i = 0; i < ARRAY_LENGTH(launchers); i++)
panel_add_item(desktop.panel,
launchers[i].icon, launchers[i].path);
desktop_shell_set_panel(desktop.shell,
window_get_wl_surface(desktop.panel->window));
desktop.background = window_create(desktop.display, 0, 0);
window_set_decoration(desktop.background, 0);
window_set_custom(desktop.background);
desktop.background_path = argv[1];
desktop_shell_set_background(desktop.shell,
window_get_wl_surface(desktop.background));
signal(SIGCHLD, sigchild_handler);
display_run(desktop.display);
return 0;
}

@ -63,7 +63,6 @@ struct display {
struct wl_shm *shm; struct wl_shm *shm;
struct wl_output *output; struct wl_output *output;
struct rectangle screen_allocation; struct rectangle screen_allocation;
int authenticated;
EGLDisplay dpy; EGLDisplay dpy;
EGLConfig rgb_config; EGLConfig rgb_config;
EGLConfig premultiplied_argb_config; EGLConfig premultiplied_argb_config;
@ -84,6 +83,13 @@ struct display {
PFNEGLDESTROYIMAGEKHRPROC destroy_image; PFNEGLDESTROYIMAGEKHRPROC destroy_image;
}; };
enum {
TYPE_FULLSCREEN,
TYPE_TOPLEVEL,
TYPE_TRANSIENT,
TYPE_CUSTOM
};
struct window { struct window {
struct display *display; struct display *display;
struct window *parent; struct window *parent;
@ -95,7 +101,7 @@ struct window {
int redraw_scheduled; int redraw_scheduled;
int minimum_width, minimum_height; int minimum_width, minimum_height;
int margin; int margin;
int fullscreen; int type;
int decoration; int decoration;
int transparent; int transparent;
struct input *grab_device; struct input *grab_device;
@ -758,14 +764,21 @@ window_attach_surface(struct window *window)
return; return;
} }
if (window->fullscreen) switch (window->type) {
case TYPE_FULLSCREEN:
wl_shell_set_fullscreen(display->shell, window->surface); wl_shell_set_fullscreen(display->shell, window->surface);
else if (!window->parent) break;
case TYPE_TOPLEVEL:
wl_shell_set_toplevel(display->shell, window->surface); wl_shell_set_toplevel(display->shell, window->surface);
else break;
case TYPE_TRANSIENT:
wl_shell_set_transient(display->shell, window->surface, wl_shell_set_transient(display->shell, window->surface,
window->parent->surface, window->parent->surface,
window->x, window->y, 0); window->x, window->y, 0);
break;
case TYPE_CUSTOM:
break;
}
wl_surface_damage(window->surface, 0, 0, wl_surface_damage(window->surface, 0, 0,
window->allocation.width, window->allocation.width,
@ -956,7 +969,7 @@ window_draw(struct window *window)
{ {
if (window->parent) if (window->parent)
window_draw_menu(window); window_draw_menu(window);
else if (window->fullscreen || !window->decoration) else if (!window->decoration)
window_create_surface(window); window_create_surface(window);
else else
window_draw_decorations(window); window_draw_decorations(window);
@ -1347,7 +1360,7 @@ void
window_get_child_allocation(struct window *window, window_get_child_allocation(struct window *window,
struct rectangle *allocation) struct rectangle *allocation)
{ {
if (window->fullscreen || !window->decoration) { if (!window->decoration) {
*allocation = window->allocation; *allocation = window->allocation;
} else { } else {
allocation->x = window->margin + 10; allocation->x = window->margin + 10;
@ -1362,7 +1375,7 @@ window_get_child_allocation(struct window *window,
void void
window_set_child_size(struct window *window, int32_t width, int32_t height) window_set_child_size(struct window *window, int32_t width, int32_t height)
{ {
if (!window->fullscreen && window->decoration) { if (window->decoration) {
window->allocation.x = 20 + window->margin; window->allocation.x = 20 + window->margin;
window->allocation.y = 60 + window->margin; window->allocation.y = 60 + window->margin;
window->allocation.width = width + 20 + window->margin * 2; window->allocation.width = width + 20 + window->margin * 2;
@ -1396,22 +1409,31 @@ window_schedule_redraw(struct window *window)
} }
} }
void
window_set_custom(struct window *window)
{
window->type = TYPE_CUSTOM;
}
void void
window_set_fullscreen(struct window *window, int fullscreen) window_set_fullscreen(struct window *window, int fullscreen)
{ {
int32_t width, height; int32_t width, height;
if (window->fullscreen == fullscreen) if (window->type == TYPE_FULLSCREEN)
return; return;
window->fullscreen = fullscreen; if (fullscreen) {
if (window->fullscreen) { window->type = TYPE_FULLSCREEN;
window->saved_allocation = window->allocation; window->saved_allocation = window->allocation;
width = window->display->screen_allocation.width; width = window->display->screen_allocation.width;
height = window->display->screen_allocation.height; height = window->display->screen_allocation.height;
window->decoration = 0;
} else { } else {
window->type = TYPE_TOPLEVEL;
width = window->saved_allocation.width - 20 - window->margin * 2; width = window->saved_allocation.width - 20 - window->margin * 2;
height = window->saved_allocation.height - 60 - window->margin * 2; height = window->saved_allocation.height - 60 - window->margin * 2;
window->decoration = 1;
} }
(*window->resize_handler)(window, width, height, window->user_data); (*window->resize_handler)(window, width, height, window->user_data);
@ -1590,6 +1612,7 @@ window_create_transient(struct display *display, struct window *parent,
if (!window) if (!window)
return NULL; return NULL;
window->type = TYPE_TRANSIENT;
window->x = x; window->x = x;
window->y = y; window->y = y;

@ -135,9 +135,9 @@ typedef void (*window_button_handler_t)(struct window *window,
typedef int (*window_enter_handler_t)(struct window *window, typedef int (*window_enter_handler_t)(struct window *window,
struct input *input, uint32_t time, struct input *input, uint32_t time,
int32_t x, int32_t y, void *data); int32_t x, int32_t y, void *data);
typedef int (*window_leave_handler_t)(struct window *window, typedef void (*window_leave_handler_t)(struct window *window,
struct input *input, uint32_t time, struct input *input, uint32_t time,
void *data); void *data);
typedef int (*window_motion_handler_t)(struct window *window, typedef int (*window_motion_handler_t)(struct window *window,
struct input *input, uint32_t time, struct input *input, uint32_t time,
@ -209,6 +209,9 @@ window_set_buffer_type(struct window *window, enum window_buffer_type type);
void void
window_set_fullscreen(struct window *window, int fullscreen); window_set_fullscreen(struct window *window, int fullscreen);
void
window_set_custom(struct window *window);
void void
window_set_user_data(struct window *window, void *data); window_set_user_data(struct window *window, void *data);

Loading…
Cancel
Save