mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toytoolkit: Remove obsolete function window_set_custom().

Browse Source
This commit is contained in:
Scott Moreau
2012-07-11 20:57:15 -06:00
committed by Kristian Høgsberg
parent a6e24d3104
commit fe89f07e33
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/tablet-shell.c
+3 -6
View File
@@ -233,10 +233,9 @@ homescreen_create(struct tablet *tablet)
homescreen = malloc (sizeof *homescreen); homescreen = malloc (sizeof *homescreen);
memset(homescreen, 0, sizeof *homescreen); memset(homescreen, 0, sizeof *homescreen);
homescreen->window = window_create(tablet->display); homescreen->window = window_create_custom(tablet->display);
homescreen->widget = homescreen->widget =
window_add_widget(homescreen->window, homescreen); window_add_widget(homescreen->window, homescreen);
window_set_custom(homescreen->window);
window_set_user_data(homescreen->window, homescreen); window_set_user_data(homescreen->window, homescreen);
window_set_title(homescreen->window, "homescreen"); window_set_title(homescreen->window, "homescreen");
widget_set_redraw_handler(homescreen->widget, homescreen_draw); widget_set_redraw_handler(homescreen->widget, homescreen_draw);
@@ -252,12 +251,11 @@ lockscreen_create(struct tablet *tablet)
lockscreen = malloc (sizeof *lockscreen); lockscreen = malloc (sizeof *lockscreen);
memset(lockscreen, 0, sizeof *lockscreen); memset(lockscreen, 0, sizeof *lockscreen);
lockscreen->window = window_create(tablet->display); lockscreen->window = window_create_custom(tablet->display);
lockscreen->widget = lockscreen->widget =
window_add_widget(lockscreen->window, lockscreen); window_add_widget(lockscreen->window, lockscreen);
window_set_user_data(lockscreen->window, lockscreen); window_set_user_data(lockscreen->window, lockscreen);
window_set_title(lockscreen->window, "lockscreen"); window_set_title(lockscreen->window, "lockscreen");
window_set_custom(lockscreen->window);
widget_set_redraw_handler(lockscreen->widget, lockscreen_draw); widget_set_redraw_handler(lockscreen->widget, lockscreen_draw);
widget_set_button_handler(lockscreen->widget, widget_set_button_handler(lockscreen->widget,
lockscreen_button_handler); lockscreen_button_handler);
@@ -284,9 +282,8 @@ show_switcher(void *data, struct tablet_shell *tablet_shell)
{ {
struct tablet *tablet = data; struct tablet *tablet = data;
tablet->switcher = window_create(tablet->display); tablet->switcher = window_create_custom(tablet->display);
window_set_user_data(tablet->switcher, tablet); window_set_user_data(tablet->switcher, tablet);
window_set_custom(tablet->switcher);
tablet_shell_set_switcher(tablet->tablet_shell, tablet_shell_set_switcher(tablet->tablet_shell,
window_get_wl_surface(tablet->switcher)); window_get_wl_surface(tablet->switcher));
} }
clients/window.c
-6
View File
@@ -2724,12 +2724,6 @@ 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)
{ {
clients/window.h
-3
View File
@@ -278,9 +278,6 @@ window_set_fullscreen(struct window *window, int fullscreen);
void void
window_set_maximized(struct window *window, int maximized); window_set_maximized(struct window *window, int maximized);
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);
clients/wscreensaver.c
-1
View File
@@ -195,7 +195,6 @@ create_wscreensaver_instance(struct wscreensaver *screensaver,
window_set_title(mi->window, progname); window_set_title(mi->window, progname);
if (screensaver->interface && !demo_mode) { if (screensaver->interface && !demo_mode) {
window_set_custom(mi->window);
mi->widget = window_add_widget(mi->window, mi); mi->widget = window_add_widget(mi->window, mi);
screensaver_set_surface(screensaver->interface, screensaver_set_surface(screensaver->interface,
window_get_wl_surface(mi->window), window_get_wl_surface(mi->window),