8000 Remove unneeded includes from wlr_input_device.h · swaywm/wlroots@e06c9e4 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit e06c9e4

Browse files
ifreundemersion
ifreund
authored and
emersion
committed
Remove unneeded includes from wlr_input_device.h
This uncovered many places where we were using things without directly including them.
1 parent 0724b3c commit e06c9e4

File tree

14 files changed

+22
-8
lines changed
  • wlr_cursor.c

    • 14 files changed

    +22
    -8
    lines changed

    ‎backend/headless/output.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,6 +2,7 @@
    22
    #include <GLES2/gl2.h>
    33
    #include <GLES2/gl2ext.h>
    44
    #include <stdlib.h>
    5+
    #include <stdio.h>
    56
    #include <wlr/interfaces/wlr_output.h>
    67
    #include <wlr/render/wlr_renderer.h>
    78
    #include <wlr/util/log.h>

    ‎backend/libinput/backend.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,7 @@
    11
    #include <assert.h>
    22
    #include <libinput.h>
    33
    #include <stdlib.h>
    4+
    #include <stdio.h>
    45
    #include <wlr/backend/interface.h>
    56
    #include <wlr/backend/session.h>
    67
    #include <wlr/util/log.h>

    ‎examples/multi-pointer.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -16,6 +16,7 @@
    1616
    #include <wlr/types/wlr_list.h>
    1717
    #include <wlr/types/wlr_matrix.h>
    1818
    #include <wlr/types/wlr_output_layout.h>
    19+
    #include <wlr/types/wlr_pointer.h>
    1920
    #include <wlr/util/log.h>
    2021
    #include <wlr/xcursor.h>
    2122
    #include <xkbcommon/xkbcommon.h>

    ‎examples/pointer.c

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,9 @@
    1515
    #include <wlr/types/wlr_list.h>
    1616
    #include <wlr/types/wlr_matrix.h>
    1717
    #include <wlr/types/wlr_output_layout.h>
    18+
    #include <wlr/types/wlr_pointer.h>
    19+
    #include <wlr/types/wlr_tablet_tool.h>
    20+
    #include <wlr/types/wlr_touch.h>
    1821
    #include <wlr/types/wlr_xcursor_manager.h>
    1922
    #include <wlr/util/log.h>
    2023
    #include <xkbcommon/xkbcommon.h>

    ‎examples/simple.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,6 +10,7 @@
    1010
    #include <wlr/render/wlr_renderer.h>
    1111
    #include <wlr/types/wlr_output.h>
    1212
    #include <wlr/types/wlr_input_device.h>
    13+
    #include <wlr/types/wlr_keyboard.h>
    1314
    #include <wlr/util/log.h>
    1415
    #include <xkbcommon/xkbcommon.h>
    1516

    ‎examples/tablet.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -14,6 +14,7 @@
    1414
    #include <wlr/types/wlr_matrix.h>
    1515
    #include <wlr/types/wlr_output.h>
    1616
    #include <wlr/types/wlr_input_device.h>
    17+
    #include <wlr/types/wlr_keyboard.h>
    1718
    #include <wlr/types/wlr_tablet_pad.h>
    1819
    #include <wlr/types/wlr_tablet_tool.h>
    1920
    #include <wlr/util/log.h>

    ‎examples/touch.c

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -14,7 +14,9 @@
    1414
    #include <wlr/render/wlr_renderer.h>
    1515
    #include <wlr/types/wlr_list.h>
    1616
    #include <wlr/types/wlr_input_device.h>
    17+
    #include <wlr/types/wlr_keyboard.h>
    1718
    #include <wlr/types/wlr_matrix.h>
    19+
    #include <wlr/types/wlr_touch.h>
    1820
    #include <wlr/util/log.h>
    1921
    #include <xkbcommon/xkbcommon.h>
    2022
    #include "cat.h"

    ‎include/backend/wayland.h

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,6 +12,7 @@
    1212
    #include <wlr/render/egl.h>
    1313
    #include <wlr/render/wlr_renderer.h>
    1414
    #include <wlr/types/wlr_box.h>
    15+
    #include <wlr/types/wlr_pointer.h>
    1516
    #include <wlr/render/drm_format_set.h>
    1617

    1718
    struct wlr_wl_backend {

    ‎include/backend/x11.h

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,7 +10,10 @@
    1010
    #include <wlr/backend/x11.h>
    1111
    #include <wlr/config.h>
    1212
    #include <wlr/interfaces/wlr_input_device.h>
    13+
    #include <wlr/interfaces/wlr_keyboard.h>
    1314
    #include <wlr/interfaces/wlr_output.h>
    15+
    #include <wlr/interfaces/wlr_pointer.h>
    16+
    #include <wlr/interfaces/wlr_touch.h>
    1417
    #include <wlr/render/egl.h>
    1518
    #include <wlr/render/wlr_renderer.h>
    1619

    ‎include/wlr/types/wlr_input_device.h

    Lines changed: 2 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,6 +9,8 @@
    99
    #ifndef WLR_TYPES_WLR_INPUT_DEVICE_H
    1010
    #define WLR_TYPES_WLR_INPUT_DEVICE_H
    1111

    12+
    #include <wayland-server-core.h>
    13+
    1214
    enum wlr_button_state {
    1315
    WLR_BUTTON_RELEASED,
    1416
    WLR_BUTTON_PRESSED,
    @@ -23,14 +25,6 @@ enum wlr_input_device_type {
    2325
    WLR_INPUT_DEVICE_SWITCH,
    2426
    };
    2527

    26-
    /* Note: these are circular dependencies */
    27-
    #include <wlr/types/wlr_keyboard.h>
    28-
    #include <wlr/types/wlr_pointer.h>
    29-
    #include <wlr/types/wlr_touch.h>
    30-
    #include <wlr/types/wlr_tablet_tool.h>
    31-
    #include <wlr/types/wlr_tablet_pad.h>
    32-
    #include <wlr/types/wlr_switch.h>
    33-
    3428
    struct wlr_input_device_impl;
    3529

    3630
    struct wlr_input_device {

    ‎include/wlr/types/wlr_pointer.h

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,6 +11,7 @@
    1111

    1212
    #include <stdint.h>
    1313
    #include <wayland-server-core.h>
    14+
    #include <wayland-server-protocol.h>
    1415
    #include <wlr/types/wlr_input_device.h>
    1516

    1617
    struct wlr_pointer_impl;

    ‎include/wlr/types/wlr_seat.h

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,7 @@
    1313
    #include <wayland-server-core.h>
    1414
    #include <wlr/types/wlr_input_device.h>
    1515
    #include <wlr/types/wlr_keyboard.h>
    16+
    #include <wlr/types/wlr_pointer.h>
    1617
    #include <wlr/types/wlr_surface.h>
    1718

    1819
    #define WLR_SERIAL_RINGSET_SIZE 128

    ‎types/tablet_v2/wlr_tablet_v2_pad.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,6 +8,7 @@
    88
    #include <types/wlr_tablet_v2.h>
    99
    #include <wayland-util.h>
    1010
    #include <wlr/types/wlr_tablet_tool.h>
    11+
    #include <wlr/types/wlr_tablet_pad.h>
    1112
    #include <wlr/types/wlr_tablet_v2.h>
    1213
    #include <wlr/util/log.h>
    1314

    ‎types/wlr_cursor.c

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,6 +7,9 @@
    77
    #include <wlr/types/wlr_input_device.h>
    88
    #include <wlr/types/wlr_output_layout.h>
    99
    #include <wlr/types/wlr_output.h>
    10+
    #include <wlr/types/wlr_pointer.h>
    11+
    #include <wlr/types/wlr_tablet_tool.h>
    12+
    #include <wlr/types/wlr_touch.h>
    1013
    #include <wlr/util/log.h>
    1114
    #include "util/signal.h"
    1215

    0 commit comments

    Comments
     (0)
    0