mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

text: Remove surface arg in create_text_model 

Remove the wl_surface argument from create_text_model request. The
wl_surface is specified as an argument in the activate request instead.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen 2012-09-09 23:08:30 +02:00 committed by Kristian Høgsberg
parent 547149a9c2
commit 4c26518ad1
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/editor.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright © 2012 Openismus GmbH * Copyright © 2012 Openismus GmbH
* Copyright © 2012 Intel Corporation
* *
* Permission to use, copy, modify, distribute, and sell this software and * Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided * its documentation for any purpose is hereby granted without fee, provided
@ -146,17 +147,14 @@ static struct text_entry*
text_entry_create(struct editor *editor, const char *text) text_entry_create(struct editor *editor, const char *text)
{ {
struct text_entry *entry; struct text_entry *entry;
struct wl_surface *surface;
entry = malloc(sizeof *entry); entry = malloc(sizeof *entry);
surface = window_get_wl_surface(editor->window);
entry->widget = editor->widget; entry->widget = editor->widget;
entry->window = editor->window; entry->window = editor->window;
entry->text = strdup(text); entry->text = strdup(text);
entry->active = 0; entry->active = 0;
entry->model = text_model_factory_create_text_model(editor->text_model_factory, surface); entry->model = text_model_factory_create_text_model(editor->text_model_factory);
text_model_add_listener(entry->model, &text_model_listener, entry); text_model_add_listener(entry->model, &text_model_listener, entry);
return entry; return entry;

1
protocol/text.xml
View File

@ -46,7 +46,6 @@
<interface name="text_model_factory" version="1"> <interface name="text_model_factory" version="1">
<request name="create_text_model"> <request name="create_text_model">
<arg name="id" type="new_id" interface="text_model"/> <arg name="id" type="new_id" interface="text_model"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request> </request>
</interface> </interface>

4
src/text-backend.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright © 2012 Openismus GmbH * Copyright © 2012 Openismus GmbH
* Copyright © 2012 Intel Corporation
* *
* Permission to use, copy, modify, distribute, and sell this software and * Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided * its documentation for any purpose is hereby granted without fee, provided
@ -181,8 +182,7 @@ static const struct text_model_interface text_model_implementation = {
static void text_model_factory_create_text_model(struct wl_client *client, static void text_model_factory_create_text_model(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t id, uint32_t id)
struct wl_resource *surface)
{ {
struct input_method *input_method = resource->data; struct input_method *input_method = resource->data;
struct text_model *text_model; struct text_model *text_model;

4
tests/test-text-client.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2012 Openismus GmbH * Copyright © 2012 Intel Corporation
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
@ -160,7 +160,7 @@ create_text_model(int fd, struct display *display)
char buf[64]; char buf[64];
int len; int len;
display->text_model = text_model_factory_create_text_model(display->factory, display->surface); display->text_model = text_model_factory_create_text_model(display->factory);
text_model_add_listener(display->text_model, &text_model_listener, display); text_model_add_listener(display->text_model, &text_model_listener, display);
wl_display_flush(display->display); wl_display_flush(display->display);

2
tests/text-test.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2012 Openismus GmbH * Copyright © 2012 Intel Corporation
* *
* Permission to use, copy, modify, distribute, and sell this software and * Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided * its documentation for any purpose is hereby granted without fee, provided