From: Jan Arne Petersen Date: Thu, 21 Jun 2012 19:52:19 +0000 (+0200) Subject: text: Add example clients for text protocol X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cba9e470bac2baeb7e3f8cbd1e2af4ba0b4e33bb;p=profile%2Fivi%2Fweston-ivi-shell.git text: Add example clients for text protocol --- diff --git a/clients/.gitignore b/clients/.gitignore index e47d674..fe50580 100644 --- a/clients/.gitignore +++ b/clients/.gitignore @@ -24,3 +24,7 @@ weston-tablet-shell weston-screenshooter weston-terminal wscreensaver +editor +text-protocol.c +text-client-protocol.h +keyboard diff --git a/clients/Makefile.am b/clients/Makefile.am index cf25a0b..5ed8839 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -51,6 +51,8 @@ clients_programs = \ resizor \ eventdemo \ clickdot \ + editor \ + keyboard \ $(full_gl_client_programs) desktop_shell = weston-desktop-shell @@ -97,6 +99,20 @@ eventdemo_LDADD = $(toolkit_libs) clickdot_SOURCES = clickdot.c clickdot_LDADD = $(toolkit_libs) +editor_SOURCES = \ + editor.c \ + text-protocol.c \ + text-client-protocol.h +editor_LDADD = $(toolkit_libs) + +keyboard_SOURCES = \ + keyboard.c \ + desktop-shell-client-protocol.h \ + desktop-shell-protocol.c \ + text-client-protocol.h \ + text-protocol.c +keyboard_LDADD = $(toolkit_libs) + weston_desktop_shell_SOURCES = \ desktop-shell.c \ desktop-shell-client-protocol.h \ @@ -114,6 +130,8 @@ BUILT_SOURCES = \ screenshooter-protocol.c \ text-cursor-position-client-protocol.h \ text-cursor-position-protocol.c \ + text-protocol.c \ + text-client-protocol.h \ desktop-shell-client-protocol.h \ desktop-shell-protocol.c \ tablet-shell-client-protocol.h \ diff --git a/clients/editor.c b/clients/editor.c new file mode 100644 index 0000000..145ba20 --- /dev/null +++ b/clients/editor.c @@ -0,0 +1,301 @@ +/* + * Copyright © 2012 Openismus GmbH + * + * 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 +#include +#include + +#include +#include + +#include "window.h" +#include "text-client-protocol.h" + +struct text_entry { + struct widget *widget; + char *text; + int active; + struct rectangle allocation; + struct text_model *model; +}; + +struct editor { + struct input_method *input_method; + struct display *display; + struct window *window; + struct widget *widget; + struct text_entry *entry; + struct text_entry *editor; +}; + +static void +text_entry_append(struct text_entry *entry, const char *text) +{ + entry->text = realloc(entry->text, strlen(entry->text) + strlen(text) + 1); + strcat(entry->text, text); +} + + +static void +text_model_commit_string(void *data, + struct text_model *text_model, + const char *text, + uint32_t index) +{ + struct text_entry *entry = data; + + text_entry_append(entry, text); + + widget_schedule_redraw(entry->widget); +} + +static const struct text_model_listener text_model_listener = { + text_model_commit_string +}; + +static struct text_entry* +text_entry_create(struct editor *editor, const char *text) +{ + struct text_entry *entry; + struct wl_surface *surface; + + entry = malloc(sizeof *entry); + + surface = window_get_wl_surface(editor->window); + + entry->widget = editor->widget; + entry->text = strdup(text); + entry->active = 0; + entry->model = input_method_create_text_model(editor->input_method, surface); + text_model_add_listener(entry->model, &text_model_listener, entry); + + return entry; +} + +static void +text_entry_destroy(struct text_entry *entry) +{ + text_model_destroy(entry->model); + free(entry->text); + free(entry); +} + +static void +text_entry_draw(struct text_entry *entry, cairo_t *cr) +{ + cairo_save(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_OVER); + + cairo_rectangle(cr, entry->allocation.x, entry->allocation.y, entry->allocation.width, entry->allocation.height); + cairo_clip(cr); + + cairo_translate(cr, entry->allocation.x, entry->allocation.y); + cairo_rectangle(cr, 0, 0, entry->allocation.width, entry->allocation.height); + cairo_set_source_rgba(cr, 1, 1, 1, 0.5); + cairo_fill(cr); + if (entry->active) { + cairo_rectangle(cr, 0, 0, entry->allocation.width, entry->allocation.height); + cairo_set_source_rgba(cr, 0, 0, 1, 0.5); + cairo_stroke(cr); + } + + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_select_font_face(cr, "sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + cairo_set_font_size(cr, 14); + + cairo_translate(cr, 10, entry->allocation.height / 2); + cairo_show_text(cr, entry->text); + + cairo_restore(cr); +} + +static void +redraw_handler(struct widget *widget, void *data) +{ + struct editor *editor = data; + cairo_surface_t *surface; + struct rectangle allocation; + cairo_t *cr; + + surface = window_get_surface(editor->window); + widget_get_allocation(editor->widget, &allocation); + + cr = cairo_create(surface); + cairo_rectangle(cr, allocation.x, allocation.y, allocation.width, allocation.height); + cairo_clip(cr); + + cairo_translate(cr, allocation.x, allocation.y); + + /* Draw background */ + cairo_push_group(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgba(cr, 1, 1, 1, 1); + cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); + cairo_fill(cr); + + /* Entry */ + text_entry_draw(editor->entry, cr); + + /* Editor */ + text_entry_draw(editor->editor, cr); + + cairo_pop_group_to_source(cr); + cairo_paint(cr); + + cairo_destroy(cr); + cairo_surface_destroy(surface); +} + +static void +text_entry_allocate(struct text_entry *entry, int32_t x, int32_t y, + int32_t width, int32_t height) +{ + entry->allocation.x = x; + entry->allocation.y = y; + entry->allocation.width = width; + entry->allocation.height = height; +} + +static void +resize_handler(struct widget *widget, + int32_t width, int32_t height, void *data) +{ + struct editor *editor = data; + + text_entry_allocate(editor->entry, 20, 20, width - 40, height / 2 - 40); + text_entry_allocate(editor->editor, 20, height / 2 + 20, width - 40, height / 2 - 40); +} + +static int32_t +rectangle_contains(struct rectangle *rectangle, int32_t x, int32_t y) +{ + if (x < rectangle->x || x > rectangle->x + rectangle->width) { + return 0; + } + + if (y < rectangle->y || y > rectangle->y + rectangle->height) { + return 0; + } + + return 1; +} + +static void +text_entry_activate(struct text_entry *entry) +{ + text_model_activate(entry->model); +} + +static void +text_entry_deactivate(struct text_entry *entry) +{ + text_model_deactivate(entry->model); +} + +static void +button_handler(struct widget *widget, + struct input *input, uint32_t time, + uint32_t button, + enum wl_pointer_button_state state, void *data) +{ + struct editor *editor = data; + struct rectangle allocation; + int32_t x, y; + + if (state != WL_POINTER_BUTTON_STATE_PRESSED || button != BTN_LEFT) { + return; + } + + input_get_position(input, &x, &y); + + widget_get_allocation(editor->widget, &allocation); + x -= allocation.x; + y -= allocation.y; + + editor->entry->active = 0; + editor->editor->active = 0; + + editor->entry->active = rectangle_contains(&editor->entry->allocation, x, y); + editor->editor->active = rectangle_contains(&editor->editor->allocation, x, y); + + if (editor->entry->active) { + text_entry_activate(editor->entry); + } else { + text_entry_deactivate(editor->entry); + } + if (editor->editor->active) { + text_entry_activate(editor->editor); + } else { + text_entry_deactivate(editor->editor); + } + + widget_schedule_redraw(widget); +} + +static void +global_handler(struct wl_display *display, uint32_t id, + const char *interface, uint32_t version, void *data) +{ + struct editor *editor = data; + + if (!strcmp(interface, "input_method")) { + editor->input_method = wl_display_bind(display, id, &input_method_interface); + } +} + +int +main(int argc, char *argv[]) +{ + struct editor editor; + + editor.display = display_create(argc, argv); + if (editor.display == NULL) { + fprintf(stderr, "failed to create display: %m\n"); + return -1; + } + wl_display_add_global_listener(display_get_display(editor.display), + global_handler, &editor); + + + editor.window = window_create(editor.display); + editor.widget = frame_create(editor.window, &editor); + + editor.entry = text_entry_create(&editor, "Entry"); + editor.editor = text_entry_create(&editor, "Editor"); + + window_set_title(editor.window, "Text Editor"); + + widget_set_redraw_handler(editor.widget, redraw_handler); + widget_set_resize_handler(editor.widget, resize_handler); + widget_set_button_handler(editor.widget, button_handler); + + window_schedule_resize(editor.window, 500, 400); + + display_run(editor.display); + + text_entry_destroy(editor.entry); + text_entry_destroy(editor.editor); + + return 0; +} diff --git a/clients/keyboard.c b/clients/keyboard.c new file mode 100644 index 0000000..f7bddeb --- /dev/null +++ b/clients/keyboard.c @@ -0,0 +1,214 @@ +/* + * Copyright © 2012 Openismus GmbH + * + * 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 +#include +#include + +#include +#include + +#include "window.h" +#include "text-client-protocol.h" +#include "desktop-shell-client-protocol.h" + +struct virtual_keyboard { + struct input_panel *input_panel; + struct input_method *input_method; + struct display *display; +}; + +struct keyboard { + struct virtual_keyboard *keyboard; + struct window *window; + struct widget *widget; + int cx; + int cy; +}; + +static void +redraw_handler(struct widget *widget, void *data) +{ + struct keyboard *keyboard = data; + cairo_surface_t *surface; + struct rectangle allocation; + cairo_t *cr; + int cx, cy; + int i; + + surface = window_get_surface(keyboard->window); + widget_get_allocation(keyboard->widget, &allocation); + + cr = cairo_create(surface); + cairo_rectangle(cr, allocation.x, allocation.y, allocation.width, allocation.height); + cairo_clip(cr); + + cairo_translate(cr, allocation.x, allocation.y); + + cx = keyboard->cx; + cy = keyboard->cy; + + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgba(cr, 1, 1, 1, 0.5); + cairo_rectangle(cr, 0, 0, 10 * cx, 5 * cy); + cairo_paint(cr); + + cairo_set_operator(cr, CAIRO_OPERATOR_OVER); + + for (i = 0; i <= 'Z' - '0'; ++i) { + const int x = i % 10; + const int y = i / 10; + char text[] = { i + '0', '\0' }; + cairo_text_extents_t extents; + int dx, dy; + + cairo_text_extents(cr, text, &extents); + dx = extents.width; + dy = extents.height; + + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_rectangle(cr, x * cx, y * cy, cx, cy); + cairo_stroke(cr); + + cairo_move_to(cr, x * cx + 0.5 * (cx - dx), y * cy + 0.5 * (cy - dy)); + + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_show_text(cr, text); + } + + cairo_destroy(cr); + cairo_surface_destroy(surface); +} + +static void +resize_handler(struct widget *widget, + int32_t width, int32_t height, void *data) +{ + /* struct keyboard *keyboard = data; */ +} + +static void +button_handler(struct widget *widget, + struct input *input, uint32_t time, + uint32_t button, + enum wl_pointer_button_state state, void *data) +{ + struct keyboard *keyboard = data; + struct rectangle allocation; + int32_t x, y; + char text[] = { '0', '\0' }; + + if (state != WL_POINTER_BUTTON_STATE_PRESSED || button != BTN_LEFT) { + return; + } + + input_get_position(input, &x, &y); + + widget_get_allocation(keyboard->widget, &allocation); + x -= allocation.x; + y -= allocation.y; + + text[0] = y / keyboard->cy * 10 + x / keyboard->cx + '0'; + + input_method_commit_string(keyboard->keyboard->input_method, text, -1); + + widget_schedule_redraw(widget); +} + +static void +global_handler(struct wl_display *display, uint32_t id, + const char *interface, uint32_t version, void *data) +{ + struct virtual_keyboard *keyboard = data; + + if (!strcmp(interface, "input_panel")) { + keyboard->input_panel = wl_display_bind(display, id, &input_panel_interface); + } else if (!strcmp(interface, "input_method")) { + keyboard->input_method = wl_display_bind(display, id, &input_method_interface); + } +} + +static void +keyboard_create(struct output *output, struct virtual_keyboard *virtual_keyboard) +{ + struct keyboard *keyboard; + + keyboard = malloc(sizeof *keyboard); + memset(keyboard, 0, sizeof *keyboard); + + keyboard->keyboard = virtual_keyboard; + keyboard->window = window_create(virtual_keyboard->display); + keyboard->widget = window_add_widget(keyboard->window, keyboard); + + window_set_title(keyboard->window, "Virtual keyboard"); + window_set_custom(keyboard->window); + window_set_user_data(keyboard->window, keyboard); + + keyboard->cx = 40; + keyboard->cy = 40; + + widget_set_redraw_handler(keyboard->widget, redraw_handler); + widget_set_resize_handler(keyboard->widget, resize_handler); + widget_set_button_handler(keyboard->widget, button_handler); + + window_schedule_resize(keyboard->window, keyboard->cx * 10, keyboard->cy * 5); + + input_panel_set_surface(virtual_keyboard->input_panel, + window_get_wl_shell_surface(keyboard->window), + output_get_wl_output(output)); +} + +static void +handle_output_configure(struct output *output, void *data) +{ + struct virtual_keyboard *virtual_keyboard = data; + + /* skip existing outputs */ + if (output_get_user_data(output)) + return; + + output_set_user_data(output, virtual_keyboard); + + keyboard_create(output, virtual_keyboard); +} + +int +main(int argc, char *argv[]) +{ + struct virtual_keyboard virtual_keyboard; + + virtual_keyboard.display = display_create(argc, argv); + if (virtual_keyboard.display == NULL) { + fprintf(stderr, "failed to create display: %m\n"); + return -1; + } + + wl_display_add_global_listener(display_get_display(virtual_keyboard.display), + global_handler, &virtual_keyboard); + + display_set_user_data(virtual_keyboard.display, &virtual_keyboard); + display_set_output_configure_handler(virtual_keyboard.display, handle_output_configure); + + display_run(virtual_keyboard.display); + + return 0; +}