aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--backend/drm/drm.c3
-rw-r--r--backend/drm/util.c2
-rw-r--r--backend/libinput/backend.c2
-rw-r--r--docs/env_vars.md20
-rw-r--r--include/backend/drm/properties.h4
-rw-r--r--include/wlr/backend/session.h2
-rw-r--r--include/wlr/types/wlr_cursor.h2
-rw-r--r--include/wlr/types/wlr_idle.h2
-rw-r--r--include/wlr/types/wlr_surface.h2
-rw-r--r--include/wlr/types/wlr_wl_shell.h2
-rw-r--r--include/wlr/types/wlr_xdg_shell.h4
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h4
-rw-r--r--include/wlr/xwayland.h2
-rw-r--r--protocol/wlr-layer-shell-unstable-v1.xml2
-rw-r--r--rootston/xdg_shell.c2
-rw-r--r--rootston/xdg_shell_v6.c2
-rw-r--r--types/wlr_matrix.c2
18 files changed, 43 insertions, 18 deletions
diff --git a/README.md b/README.md
index d65949da..8ab2422e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ code you were going to write anyway.
wlroots implements a huge variety of Wayland compositor features and implements
them *right*, so you can focus on the features that make your compositor
unique. By using wlroots, you get high performance, excellent hardware
-compatability, broad support for many wayland interfaces, and comfortable
+compatibility, broad support for many wayland interfaces, and comfortable
development tools - or any subset of these features you like, because all of
them work independently of one another and freely compose with anything you want
to implement yourself.
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index dc512151..7ace90dc 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -32,7 +32,8 @@ bool check_drm_features(struct wlr_drm_backend *drm) {
return false;
}
- if (getenv("WLR_DRM_NO_ATOMIC")) {
+ const char *no_atomic = getenv("WLR_DRM_NO_ATOMIC");
+ if (no_atomic && strcmp(no_atomic, "1") == 0) {
wlr_log(L_DEBUG, "WLR_DRM_NO_ATOMIC set, forcing legacy DRM interface");
drm->iface = &legacy_iface;
} else if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
diff --git a/backend/drm/util.c b/backend/drm/util.c
index 41ba47d1..73669205 100644
--- a/backend/drm/util.c
+++ b/backend/drm/util.c
@@ -266,7 +266,7 @@ static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_
continue;
}
- // Not compatable
+ // Not compatible
if (!(st->objs[st->res[i]] & (1 << i))) {
continue;
}
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 4fcd2fe4..f4d54c97 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -92,7 +92,7 @@ static bool backend_start(struct wlr_backend *_backend) {
wlr_log(L_ERROR, "Failed to create input event on event loop");
return false;
}
- wlr_log(L_DEBUG, "libinput sucessfully initialized");
+ wlr_log(L_DEBUG, "libinput successfully initialized");
return true;
}
diff --git a/docs/env_vars.md b/docs/env_vars.md
new file mode 100644
index 00000000..5744701a
--- /dev/null
+++ b/docs/env_vars.md
@@ -0,0 +1,20 @@
+wlroots reads these environment variables
+
+wlroots specific
+----------------
+* *WLR_DRM_DEVICES*: specifies the DRM devices (as a colon separated list) instead of auto probing them. The first existing device in this list is considered the primary DRM device.
+* *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic mode setting
+* *WLR_LIBINPUT_NO_DEVICES*: set to 1 to not fail without any input devices
+* *WLR_WL_OUTPUTS*: when using the wayland backend specifies the number of outputs
+* *WLR_X11_OUTPUTS*: when using the X11 backend specifies the number of outputs
+
+rootston specific
+------------------
+* *XKB_DEFAULT_RULES*, *XKB_DEFAULT_MODEL*, *XKB_DEFAULT_LAYOUT*, *XKB_DEFAULT_VARIANT*, *XKB_DEFAULT_OPTIONS*: xkb setup
+
+generic
+-------
+* *DISPLAY*: if set probe X11 backend in *wlr_backend_autocreate*
+* *WAYLAND_DISPLAY*, *_WAYLAND_DISPLAY*, *WAYLAND_SOCKET*: if set probe Wayland backend in *wlr_backend_autocreate*
+* *XCURSOR_PATH*: directory where xcursors are located
+* *XDG_RUNTIME_DIR*: used to store non persistent temporary files
diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h
index 1b3b2241..5b17e77e 100644
--- a/include/backend/drm/properties.h
+++ b/include/backend/drm/properties.h
@@ -24,7 +24,7 @@ union wlr_drm_connector_props {
union wlr_drm_crtc_props {
struct {
- // Neither of these are guranteed to exist
+ // Neither of these are guaranteed to exist
uint32_t rotation;
uint32_t scaling_mode;
@@ -41,7 +41,7 @@ union wlr_drm_crtc_props {
union wlr_drm_plane_props {
struct {
uint32_t type;
- uint32_t rotation; // Not guranteed to exist
+ uint32_t rotation; // Not guaranteed to exist
// atomic-modesetting only
diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h
index 7ff9691f..4d04b363 100644
--- a/include/wlr/backend/session.h
+++ b/include/wlr/backend/session.h
@@ -43,7 +43,7 @@ struct wlr_session {
* of the terminal (Xorg, another Wayland compositor, etc.).
*
* If logind support is not enabled, you must have CAP_SYS_ADMIN or be root.
- * It is safe to drop priviledges after this is called.
+ * It is safe to drop privileges after this is called.
*
* Returns NULL on error.
*/
diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h
index 1a9e0d38..998c6f0d 100644
--- a/include/wlr/types/wlr_cursor.h
+++ b/include/wlr/types/wlr_cursor.h
@@ -117,7 +117,7 @@ void wlr_cursor_set_image(struct wlr_cursor *cur, const uint8_t *pixels,
/**
* Set the cursor surface. The surface can be committed to update the cursor
- * image. The surface position is substracted from the hotspot. A NULL surface
+ * image. The surface position is subtracted from the hotspot. A NULL surface
* commit hides the cursor.
*/
void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface,
diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h
index 1744f07c..45f350be 100644
--- a/include/wlr/types/wlr_idle.h
+++ b/include/wlr/types/wlr_idle.h
@@ -7,7 +7,7 @@
/**
* Idle protocol is used to create timers which will notify the client when the
* compositor does not receive any input for a given time(in milliseconds). Also
- * the client will be notify when the timer receve an activity notify and already
+ * the client will be notified when the timer receives an activity notify and already
* was in idle state. Besides this, the client is able to simulate user activity
* which will reset the timers and at any time can destroy the timer.
*/
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index c6eb3c7d..d1127c86 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -171,7 +171,7 @@ struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource);
/**
* Call `iterator` on each surface in the surface tree, with the surface's
- * positon relative to the root surface. The function is called from root to
+ * position relative to the root surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_surface_for_each_surface(struct wlr_surface *surface,
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 1b38b2e3..b60a0ddd 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -157,7 +157,7 @@ struct wlr_wl_surface *wlr_wl_shell_surface_from_wlr_surface(
/**
* Call `iterator` on each surface in the shell surface tree, with the surface's
- * positon relative to the root xdg-surface. The function is called from root to
+ * position relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_wl_shell_surface_for_each_surface(struct wlr_wl_shell_surface *surface,
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h
index ead4613a..22008563 100644
--- a/include/wlr/types/wlr_xdg_shell.h
+++ b/include/wlr/types/wlr_xdg_shell.h
@@ -128,7 +128,7 @@ struct wlr_xdg_surface_configure {
*
* When a surface has a role and is ready to be displayed, the `map` event is
* emitted. When a surface should no longer be displayed, the `unmap` event is
- * emitted. The `unmap` event is guaranted to be emitted before the `destroy`
+ * emitted. The `unmap` event is guaranteed to be emitted before the `destroy`
* event if the view is destroyed when mapped.
*/
struct wlr_xdg_surface {
@@ -314,7 +314,7 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
/**
* Call `iterator` on each surface in the xdg-surface tree, with the surface's
- * positon relative to the root xdg-surface. The function is called from root to
+ * position relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_xdg_surface_for_each_surface(struct wlr_xdg_surface *surface,
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index a315c4d9..3d35520b 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -97,7 +97,7 @@ struct wlr_xdg_toplevel_v6_state {
*
* When a surface has a role and is ready to be displayed, the `map` event is
* emitted. When a surface should no longer be displayed, the `unmap` event is
- * emitted. The `unmap` event is guaranted to be emitted before the `destroy`
+ * emitted. The `unmap` event is guaranteed to be emitted before the `destroy`
* event if the view is destroyed when mapped.
*/
struct wlr_xdg_toplevel_v6 {
@@ -306,7 +306,7 @@ struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface(
/**
* Call `iterator` on each surface in the xdg-surface tree, with the surface's
- * positon relative to the root xdg-surface. The function is called from root to
+ * position relative to the root xdg-surface. The function is called from root to
* leaves (in rendering order).
*/
void wlr_xdg_surface_v6_for_each_surface(struct wlr_xdg_surface_v6 *surface,
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 11aedc37..b2c23667 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -81,7 +81,7 @@ struct wlr_xwayland_surface_size_hints {
*
* When a surface is ready to be displayed, the `map` event is emitted. When a
* surface should no longer be displayed, the `unmap` event is emitted. The
- * `unmap` event is guaranted to be emitted before the `destroy` event if the
+ * `unmap` event is guaranteed to be emitted before the `destroy` event if the
* view is destroyed when mapped.
*/
struct wlr_xwayland_surface {
diff --git a/protocol/wlr-layer-shell-unstable-v1.xml b/protocol/wlr-layer-shell-unstable-v1.xml
index 6a5d5d35..216e0d9f 100644
--- a/protocol/wlr-layer-shell-unstable-v1.xml
+++ b/protocol/wlr-layer-shell-unstable-v1.xml
@@ -140,7 +140,7 @@
how they should interact with surfaces that do. If set to zero, the
surface indicates that it would like to be moved to avoid occluding
surfaces with a positive excluzive zone. If set to -1, the surface
- indicates that it would not like to be moved to accomodate for other
+ indicates that it would not like to be moved to accommodate for other
surfaces, and the compositor should extend it all the way to the edges
it is anchored to.
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c
index bd670a87..83a1caf0 100644
--- a/rootston/xdg_shell.c
+++ b/rootston/xdg_shell.c
@@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
}
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link);
+ wl_list_remove(&popup->map.link);
+ wl_list_remove(&popup->unmap.link);
view_child_finish(&popup->view_child);
free(popup);
}
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 39e8a4b7..5a829f5d 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -18,6 +18,8 @@ static void popup_destroy(struct roots_view_child *child) {
}
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link);
+ wl_list_remove(&popup->map.link);
+ wl_list_remove(&popup->unmap.link);
view_child_finish(&popup->view_child);
free(popup);
}
diff --git a/types/wlr_matrix.c b/types/wlr_matrix.c
index 6eb47ca8..2c896313 100644
--- a/types/wlr_matrix.c
+++ b/types/wlr_matrix.c
@@ -117,7 +117,7 @@ void wlr_matrix_transform(float mat[static 9],
wlr_matrix_multiply(mat, mat, transforms[transform]);
}
-// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
+// Equivalent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
void wlr_matrix_projection(float mat[static 9], int width, int height,
enum wl_output_transform transform) {
memset(mat, 0, sizeof(*mat) * 9);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 02:53:53 +0000