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

Rename frame_create and frame_set_child_size with a window_ prefix 

This is to avoid a collision with an actual frame structure.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2013-10-13 19:08:38 -05:00 committed by Kristian Høgsberg
parent bcfd07b70a
commit ee7fefcffc
13 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/clickdot.c
View File

@ -249,7 +249,7 @@ clickdot_create(struct display *display)
clickdot = xzalloc(sizeof *clickdot);
clickdot->window = window_create(display);
clickdot->widget = frame_create(clickdot->window, clickdot);
clickdot->widget = window_frame_create(clickdot->window, clickdot);
window_set_title(clickdot->window, "Wayland ClickDot");
clickdot->display = display;
clickdot->buffer = NULL;

2
clients/cliptest.c
View File

@ -798,7 +798,7 @@ cliptest_create(struct display *display)
geometry_init(&cliptest->ui.geometry);
cliptest->window = window_create(display);
cliptest->widget = frame_create(cliptest->window, cliptest);
cliptest->widget = window_frame_create(cliptest->window, cliptest);
window_set_title(cliptest->window, "cliptest");
cliptest->display = display;

2
clients/desktop-shell.c
View File

@ -896,7 +896,7 @@ unlock_dialog_create(struct desktop *desktop)
dialog = xzalloc(sizeof *dialog);
dialog->window = window_create_custom(display);
dialog->widget = frame_create(dialog->window, dialog);
dialog->widget = window_frame_create(dialog->window, dialog);
window_set_title(dialog->window, "Unlock your desktop");
window_set_user_data(dialog->window, dialog);

4
clients/dnd.c
View File

@ -589,7 +589,7 @@ dnd_create(struct display *display)
dnd = xzalloc(sizeof *dnd);
dnd->window = window_create(display);
dnd->widget = frame_create(dnd->window, dnd);
dnd->widget = window_frame_create(dnd->window, dnd);
window_set_title(dnd->window, "Wayland Drag and Drop Demo");
dnd->display = display;
@ -618,7 +618,7 @@ dnd_create(struct display *display)
width = 4 * (item_width + item_padding) + item_padding;
height = 4 * (item_height + item_padding) + item_padding;
frame_set_child_size(dnd->widget, width, height);
window_frame_set_child_size(dnd->widget, width, height);
return dnd;
}

2
clients/editor.c
View File

@ -1221,7 +1221,7 @@ main(int argc, char *argv[])
display_set_global_handler(editor.display, global_handler);
editor.window = window_create(editor.display);
editor.widget = frame_create(editor.window, &editor);
editor.widget = window_frame_create(editor.window, &editor);
editor.entry = text_entry_create(&editor, "Entry");
editor.entry->click_to_show = click_to_show;

2
clients/eventdemo.c
View File

@ -307,7 +307,7 @@ eventdemo_create(struct display *d)
*/
e->widget = window_add_widget(e->window, e);
} else {
e->widget = frame_create(e->window, e);
e->widget = window_frame_create(e->window, e);
window_set_title(e->window, title);
}
e->display = d;

2
clients/image.c
View File

@ -378,7 +378,7 @@ image_create(struct display *display, const char *filename,
}
image->window = window_create(display);
image->widget = frame_create(image->window, image);
image->widget = window_frame_create(image->window, image);
window_set_title(image->window, title);
image->display = display;
image->image_counter = image_counter;

2
clients/nested.c
View File

@ -583,7 +583,7 @@ nested_create(struct display *display)
return nested;
nested->window = window_create(display);
nested->widget = frame_create(nested->window, nested);
nested->widget = window_frame_create(nested->window, nested);
window_set_title(nested->window, "Wayland Nested");
nested->display = display;

2
clients/resizor.c
View File

@ -235,7 +235,7 @@ resizor_create(struct display *display)
resizor = xzalloc(sizeof *resizor);
resizor->window = window_create(display);
resizor->widget = frame_create(resizor->window, resizor);
resizor->widget = window_frame_create(resizor->window, resizor);
window_set_title(resizor->window, "Wayland Resizor");
resizor->display = display;

2
clients/subsurfaces.c
View File

@ -722,7 +722,7 @@ demoapp_create(struct display *display)
display_set_user_data(app->display, app);
app->window = window_create(app->display);
app->widget = frame_create(app->window, app);
app->widget = window_frame_create(app->window, app);
window_set_title(app->window, "Wayland Sub-surface Demo");
window_set_key_handler(app->window, key_handler);

4
clients/terminal.c
View File

@ -840,7 +840,7 @@ terminal_resize(struct terminal *terminal, int columns, int rows)
width = columns * terminal->average_width + m;
height = rows * terminal->extents.height + m;
frame_set_child_size(terminal->widget, width, height);
window_frame_set_child_size(terminal->widget, width, height);
}
struct color_scheme DEFAULT_COLORS = {
@ -2652,7 +2652,7 @@ terminal_create(struct display *display)
terminal->margin_top = 0;
terminal->margin_bottom = -1;
terminal->window = window_create(display);
terminal->widget = frame_create(terminal->window, terminal);
terminal->widget = window_frame_create(terminal->window, terminal);
window_set_title(terminal->window, "Wayland Terminal");
widget_set_transparent(terminal->widget, 0);

11
clients/window.c
View File

@ -1514,7 +1514,7 @@ window_get_output_scale(struct window *window)
return scale;
}
static void frame_destroy(struct frame *frame);
static void window_frame_destroy(struct frame *frame);
static void
surface_destroy(struct surface *surface)
@ -1568,7 +1568,7 @@ window_destroy(struct window *window)
}
if (window->frame)
frame_destroy(window->frame);
window_frame_destroy(window->frame);
if (window->shell_surface)
wl_shell_surface_destroy(window->shell_surface);
@ -2706,7 +2706,7 @@ frame_touch_down_handler(struct widget *widget, struct input *input,
}
struct widget *
frame_create(struct window *window, void *data)
window_frame_create(struct window *window, void *data)
{
struct frame *frame;
@ -2742,7 +2742,8 @@ frame_create(struct window *window, void *data)
}
void
frame_set_child_size(struct widget *widget, int child_width, int child_height)
window_frame_set_child_size(struct widget *widget, int child_width,
int child_height)
{
struct display *display = widget->window->display;
struct theme *t = display->theme;
@ -2766,7 +2767,7 @@ frame_set_child_size(struct widget *widget, int child_width, int child_height)
}
static void
frame_destroy(struct frame *frame)
window_frame_destroy(struct frame *frame)
{
struct frame_button *button, *tmp;

5
clients/window.h
View File

@ -508,10 +508,11 @@ void
widget_schedule_redraw(struct widget *widget);
struct widget *
frame_create(struct window *window, void *data);
window_frame_create(struct window *window, void *data);
void
frame_set_child_size(struct widget *widget, int child_width, int child_height);
window_frame_set_child_size(struct widget *widget, int child_width,
int child_height);
void
input_set_pointer_image(struct input *input, int pointer);