Skip to content

Commit

Permalink
hrt: don't keep list of available outputs
Browse files Browse the repository at this point in the history
Keeping a list of the available outputs just duplicates work that we
have to do in the frontend anyways; the only reason why hrt should
keep it is if we do things with the list of outputs without input
from the front end. We might do that eventually for things like output
configuration, but we aren't anywhere near that yet.
  • Loading branch information
sdilts committed Nov 10, 2023
1 parent 3ec15ef commit dfe428a
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion heart/include/hrt/hrt_output.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
struct hrt_output {
struct wlr_output *wlr_output;
struct hrt_server *server;
struct wl_list link;

struct wl_listener frame;
struct wl_listener destroy;
Expand Down
1 change: 0 additions & 1 deletion heart/include/hrt/hrt_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ struct hrt_server {
struct wlr_allocator *allocator;

struct wlr_scene *scene;
struct wl_list outputs;
struct wl_listener new_output;
struct wlr_output_manager_v1 *output_manager;
struct wlr_output_layout *output_layout;
Expand Down
4 changes: 0 additions & 4 deletions heart/src/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ static void handle_frame_notify(struct wl_listener *listener, void *data) {
static void handle_output_destroy(struct wl_listener *listener, void *data) {
wlr_log(WLR_DEBUG, "Output destroyed");
struct hrt_output *output = wl_container_of(listener, output, destroy);
wl_list_remove(&output->link);
struct hrt_server *server = output->server;
server->output_callback->output_removed(output);

Expand Down Expand Up @@ -70,7 +69,6 @@ static void handle_new_output(struct wl_listener *listener, void *data) {

output->destroy.notify = handle_output_destroy;
wl_signal_add(&wlr_output->events.destroy, &output->destroy);
wl_list_insert(&server->outputs, &output->link);

struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output);
if (mode != NULL) {
Expand Down Expand Up @@ -109,8 +107,6 @@ bool hrt_output_init(struct hrt_server *server, const struct hrt_output_callback
server->output_manager_apply.notify = handle_output_manager_apply;
server->output_manager_test.notify = handle_output_manager_test;

wl_list_init(&server->outputs);

// temporary random seed:
srand(time(0));

Expand Down
2 changes: 0 additions & 2 deletions lisp/bindings/hrt-bindings.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ See themes section of man xcursor(3) to find where to find valid cursor names."
(cffi:defcstruct hrt-output
(wlr-output :pointer #| (:struct wlr-output) |# )
(server (:pointer (:struct hrt-server)))
(link (:struct wl-list))
(frame (:struct wl-listener))
(destroy (:struct wl-listener))
(color :float :count 4))
Expand All @@ -127,7 +126,6 @@ See themes section of man xcursor(3) to find where to find valid cursor names."
(compositor :pointer #| (:struct wlr-compositor) |# )
(allocator :pointer #| (:struct wlr-allocator) |# )
(scene :pointer #| (:struct wlr-scene) |# )
(outputs (:struct wl-list))
(new-output (:struct wl-listener))
(output-manager :pointer #| (:struct wlr-output-manager-v1) |# )
(output-layout :pointer #| (:struct wlr-output-layout) |# )
Expand Down

0 comments on commit dfe428a

Please sign in to comment.