Convert to wl_global_create/destroy()

clients/nested.c

@@ -44,6 +44,8 @@
 
 #include "window.h"
 
+#define MIN(x,y) (((x) < (y)) ? (x) : (y))
+
 struct nested {
 	struct display *display;
 	struct window *window;
@@ -347,10 +349,10 @@ surface_frame(struct wl_client *client,
 		return;
 	}
 
-	callback->resource =
+	callback->resource = wl_resource_create(client,
-		wl_client_add_object(client, &wl_callback_interface,
+						&wl_callback_interface, 1, id);
-				     NULL, id, callback);
+	wl_resource_set_implementation(callback->resource, NULL, callback,
-	wl_resource_set_destructor(callback->resource, destroy_frame_callback);
+				       destroy_frame_callback);
 
 	wl_list_insert(nested->frame_callback_list.prev, &callback->link);
 }
@@ -423,9 +425,11 @@ compositor_create_surface(struct wl_client *client,
 	display_release_window_surface(nested->display, nested->window);
 
 	surface->resource =
-		wl_client_add_object(client, &wl_surface_interface,
+		wl_resource_create(client, &wl_surface_interface, 1, id);
-				     &surface_interface, id, surface);
+
-	wl_resource_set_destructor(surface->resource, destroy_surface);
+	wl_resource_set_implementation(surface->resource,
+				       &surface_interface, surface,
+				       destroy_surface);
 
 	wl_list_insert(nested->surface_list.prev, &surface->link);
 }
@@ -488,23 +492,27 @@ compositor_create_region(struct wl_client *client,
 	pixman_region32_init(&region->region);
 
 	region->resource =
-		wl_client_add_object(client, &wl_region_interface,
+		wl_resource_create(client, &wl_region_interface, 1, id);
-				     &region_interface, id, region);
+	wl_resource_set_implementation(region->resource, &region_interface,
-	wl_resource_set_destructor(region->resource, destroy_region);
+				       region, destroy_region);
 }
 
 static const struct wl_compositor_interface compositor_interface = {
 	compositor_create_surface,
 	compositor_create_region
 };
+
 static void
 compositor_bind(struct wl_client *client,
 		void *data, uint32_t version, uint32_t id)
 {
 	struct nested *nested = data;
+	struct wl_resource *resource;
 
-	wl_client_add_object(client, &wl_compositor_interface,
+	resource = wl_resource_create(client, &wl_compositor_interface,
-			     &compositor_interface, id, nested);
+				      MIN(version, 3), id);
+	wl_resource_set_implementation(resource, &compositor_interface,
+				       nested, NULL);
 }
 
 static int
@@ -523,9 +531,9 @@ nested_init_compositor(struct nested *nested)
 	display_watch_fd(nested->display, fd,
 			 EPOLLIN, &nested->child_task);
 
-	if (!wl_display_add_global(nested->child_display,
+	if (!wl_global_create(nested->child_display,
-				   &wl_compositor_interface,
+			      &wl_compositor_interface, 1,
-				   nested, compositor_bind))
+			      nested, compositor_bind))
 		return -1;
 
 	wl_display_init_shm(nested->child_display);

src/compositor.c

@@ -2571,8 +2571,6 @@ bind_output(struct wl_client *client,
 WL_EXPORT void
 weston_output_destroy(struct weston_output *output)
 {
-	struct weston_compositor *c = output->compositor;
-
 	wl_signal_emit(&output->destroy_signal, output);
 
 	free(output->name);
@@ -2580,7 +2578,7 @@ weston_output_destroy(struct weston_output *output)
 	pixman_region32_fini(&output->previous_damage);
 	output->compositor->output_id_pool &= ~(1 << output->id);
 
-	wl_display_remove_global(c->wl_display, output->global);
+	wl_global_destroy(output->global);
 }
 
 static void
@@ -2748,8 +2746,8 @@ weston_output_init(struct weston_output *output, struct weston_compositor *c,
 	output->compositor->output_id_pool |= 1 << output->id;
 
 	output->global =
-		wl_display_add_global(c->wl_display, &wl_output_interface,
+		wl_global_create(c->wl_display, &wl_output_interface, 2,
-				      output, bind_output);
+				 output, bind_output);
 	wl_signal_emit(&c->output_created_signal, output);
 }
 
@@ -2828,12 +2826,12 @@ weston_compositor_init(struct weston_compositor *ec,
 
 	ec->output_id_pool = 0;
 
-	if (!wl_display_add_global(display, &wl_compositor_interface,
+	if (!wl_global_create(display, &wl_compositor_interface, 3,
-				   ec, compositor_bind))
+			      ec, compositor_bind))
 		return -1;
 
-	if (!wl_display_add_global(display, &wl_subcompositor_interface,
+	if (!wl_global_create(display, &wl_subcompositor_interface, 1,
-				   ec, bind_subcompositor))
+			      ec, bind_subcompositor))
 		return -1;
 
 	wl_list_init(&ec->surface_list);

src/data-device.c

@@ -620,9 +620,9 @@ wl_data_device_set_keyboard_focus(struct weston_seat *seat)
 WL_EXPORT int
 wl_data_device_manager_init(struct wl_display *display)
 {
-	if (wl_display_add_global(display,
+	if (wl_global_create(display,
-				  &wl_data_device_manager_interface,
+			     &wl_data_device_manager_interface, 1,
-				  NULL, bind_manager) == NULL)
+			     NULL, bind_manager) == NULL)
 		return -1;
 
 	return 0;

src/input.c

@@ -1531,9 +1531,8 @@ weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec,
 	wl_list_init(&seat->drag_resource_list);
 	wl_signal_init(&seat->destroy_signal);
 
-	seat->global =
+	seat->global = wl_global_create(ec->wl_display, &wl_seat_interface, 2,
-		wl_display_add_global(ec->wl_display,
+					seat, bind_seat);
-				      &wl_seat_interface, seat, bind_seat);
 
 	seat->compositor = ec;
 	seat->modifier_state = 0;
@@ -1569,7 +1568,7 @@ weston_seat_release(struct weston_seat *seat)
 
 	free (seat->seat_name);
 
-	wl_display_remove_global(seat->compositor->wl_display, seat->global);
+	wl_global_destroy(seat->global);
 
 	wl_signal_emit(&seat->destroy_signal, seat);
 }

src/screenshooter.c

@@ -559,7 +559,7 @@ screenshooter_destroy(struct wl_listener *listener, void *data)
 	struct screenshooter *shooter =
 		container_of(listener, struct screenshooter, destroy_listener);
 
-	wl_display_remove_global(shooter->ec->wl_display, shooter->global);
+	wl_global_destroy(shooter->global);
 	free(shooter);
 }
 
@@ -575,9 +575,9 @@ screenshooter_create(struct weston_compositor *ec)
 	shooter->ec = ec;
 	shooter->client = NULL;
 
-	shooter->global = wl_display_add_global(ec->wl_display,
+	shooter->global = wl_global_create(ec->wl_display,
-						&screenshooter_interface,
+					   &screenshooter_interface, 1,
-						shooter, bind_shooter);
+					   shooter, bind_shooter);
 	weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER,
 					  screenshooter_binding, shooter);
 	weston_compositor_add_key_binding(ec, KEY_R, MODIFIER_SUPER,

src/shell.c

@@ -4507,25 +4507,25 @@ module_init(struct weston_compositor *ec,
 	wl_list_init(&shell->workspaces.animation.link);
 	shell->workspaces.animation.frame = animate_workspace_change_frame;
 
-	if (wl_display_add_global(ec->wl_display, &wl_shell_interface,
+	if (wl_global_create(ec->wl_display, &wl_shell_interface, 1,
 				  shell, bind_shell) == NULL)
 		return -1;
 
-	if (wl_display_add_global(ec->wl_display,
+	if (wl_global_create(ec->wl_display,
-				  &desktop_shell_interface,
+			     &desktop_shell_interface, 2,
-				  shell, bind_desktop_shell) == NULL)
+			     shell, bind_desktop_shell) == NULL)
 		return -1;
 
-	if (wl_display_add_global(ec->wl_display, &screensaver_interface,
+	if (wl_global_create(ec->wl_display, &screensaver_interface, 1,
-				  shell, bind_screensaver) == NULL)
+			     shell, bind_screensaver) == NULL)
 		return -1;
 
-	if (wl_display_add_global(ec->wl_display, &wl_input_panel_interface,
+	if (wl_global_create(ec->wl_display, &wl_input_panel_interface, 1,
 				  shell, bind_input_panel) == NULL)
 		return -1;
 
-	if (wl_display_add_global(ec->wl_display, &workspace_manager_interface,
+	if (wl_global_create(ec->wl_display, &workspace_manager_interface, 1,
-				  shell, bind_workspace_manager) == NULL)
+			     shell, bind_workspace_manager) == NULL)
 		return -1;
 
 	shell->child.deathstamp = weston_compositor_get_time();

src/tablet-shell.c

@@ -542,8 +542,8 @@ module_init(struct weston_compositor *compositor,
 	wl_signal_add(&compositor->wake_signal, &shell->unlock_listener);
 
 	/* FIXME: This will make the object available to all clients. */
-	wl_display_add_global(compositor->wl_display, &tablet_shell_interface,
+	wl_global_create(compositor->wl_display, &tablet_shell_interface, 1,
-			      shell, bind_tablet_shell);
+			 shell, bind_tablet_shell);
 
 	loop = wl_display_get_event_loop(compositor->wl_display);
 	shell->long_press_source =

src/text-backend.c

@@ -398,8 +398,7 @@ text_input_manager_notifier_destroy(struct wl_listener *listener, void *data)
 	struct text_input_manager *text_input_manager =
 		container_of(listener, struct text_input_manager, destroy_listener);
 
-	wl_display_remove_global(text_input_manager->ec->wl_display,
+	wl_global_destroy(text_input_manager->text_input_manager_global);
-				 text_input_manager->text_input_manager_global);
 
 	free(text_input_manager);
 }
@@ -414,9 +413,9 @@ text_input_manager_create(struct weston_compositor *ec)
 	text_input_manager->ec = ec;
 
 	text_input_manager->text_input_manager_global =
-		wl_display_add_global(ec->wl_display,
+		wl_global_create(ec->wl_display,
-				      &wl_text_input_manager_interface,
+				 &wl_text_input_manager_interface, 1,
-				      text_input_manager, bind_text_input_manager);
+				 text_input_manager, bind_text_input_manager);
 
 	text_input_manager->destroy_listener.notify = text_input_manager_notifier_destroy;
 	wl_signal_add(&ec->destroy_signal, &text_input_manager->destroy_listener);
@@ -792,8 +791,7 @@ input_method_notifier_destroy(struct wl_listener *listener, void *data)
 	if (input_method->model)
 		deactivate_text_input(input_method->model, input_method);
 
-	wl_display_remove_global(input_method->seat->compositor->wl_display,
+	wl_global_destroy(input_method->input_method_global);
-				 input_method->input_method_global);
 
 	free(input_method);
 }
@@ -899,9 +897,8 @@ handle_seat_created(struct wl_listener *listener,
 	input_method->text_backend = text_backend;
 
 	input_method->input_method_global =
-		wl_display_add_global(ec->wl_display,
+		wl_global_create(ec->wl_display, &wl_input_method_interface, 1,
-				      &wl_input_method_interface,
+				 input_method, bind_input_method);
-				      input_method, bind_input_method);
 
 	input_method->destroy_listener.notify = input_method_notifier_destroy;
 	wl_signal_add(&seat->destroy_signal, &input_method->destroy_listener);

src/xwayland/launcher.c

@@ -376,7 +376,7 @@ module_init(struct weston_compositor *compositor,
 				     WL_EVENT_READABLE,
 				     weston_xserver_handle_event, wxs);
 
-	wl_display_add_global(display, &xserver_interface, wxs, bind_xserver);
+	wl_global_create(display, &xserver_interface, 1, wxs, bind_xserver);
 
 	wxs->destroy_listener.notify = weston_xserver_destroy;
 	wl_signal_add(&compositor->destroy_signal, &wxs->destroy_listener);

src/zoom.c

@@ -69,7 +69,7 @@ text_cursor_position_notifier_destroy(struct wl_listener *listener, void *data)
 	struct text_cursor_position *text_cursor_position =
 		container_of(listener, struct text_cursor_position, destroy_listener);
 
-	wl_display_remove_global(text_cursor_position->ec->wl_display, text_cursor_position->global);
+	wl_global_destroy(text_cursor_position->global);
 	free(text_cursor_position);
 }
 
@@ -84,11 +84,14 @@ text_cursor_position_notifier_create(struct weston_compositor *ec)
 
 	text_cursor_position->ec = ec;
 
-	text_cursor_position->global = wl_display_add_global(ec->wl_display,
+	text_cursor_position->global =
-						&text_cursor_position_interface,
+		wl_global_create(ec->wl_display,
-						text_cursor_position, bind_text_cursor_position);
+				 &text_cursor_position_interface, 1,
+				 text_cursor_position,
+				 bind_text_cursor_position);
 
-	text_cursor_position->destroy_listener.notify = text_cursor_position_notifier_destroy;
+	text_cursor_position->destroy_listener.notify =
+		text_cursor_position_notifier_destroy;
 	wl_signal_add(&ec->destroy_signal, &text_cursor_position->destroy_listener);
 }
 

tests/weston-test.c

@@ -240,8 +240,8 @@ module_init(struct weston_compositor *ec,
 	test->compositor = ec;
 	weston_layer_init(&test->layer, &ec->cursor_layer.link);
 
-	if (wl_display_add_global(ec->wl_display, &wl_test_interface,
+	if (wl_global_create(ec->wl_display, &wl_test_interface, 1,
-				  test, bind_test) == NULL)
+			     test, bind_test) == NULL)
 		return -1;
 
 	loop = wl_display_get_event_loop(ec->wl_display);