summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/xcwm/input.h4
-rw-r--r--src/libxcwm/atoms.c4
-rw-r--r--src/libxcwm/context.c2
-rw-r--r--src/libxcwm/event_loop.c2
-rw-r--r--src/libxcwm/image.c2
-rw-r--r--src/libxcwm/window.c2
-rw-r--r--src/libxcwm/xcwm_internal.h8
-rw-r--r--src/xtoq/XtoqController.m2
8 files changed, 13 insertions, 13 deletions
diff --git a/include/xcwm/input.h b/include/xcwm/input.h
index 4fe4a13..31836a2 100644
--- a/include/xcwm/input.h
+++ b/include/xcwm/input.h
@@ -32,7 +32,7 @@
/**
* Send key event to the X server.
- * @param context The context the event occured in.
+ * @param context The context the event occurred in.
* @param code The keycode of event.
* @param state 1 if key has been pressed, 0 if key released.
*/
@@ -41,7 +41,7 @@ xcwm_input_key_event(xcwm_context_t *context, uint8_t code, int state);
/**
* Send mouse button event to the X Server.
- * @param window The window the event occured in.
+ * @param window The window the event occurred in.
* @param button The mouse button pressed.
* @param state 1 if the mouse button is pressed down, 0 if released.
*/
diff --git a/src/libxcwm/atoms.c b/src/libxcwm/atoms.c
index db3fc01..a498dc7 100644
--- a/src/libxcwm/atoms.c
+++ b/src/libxcwm/atoms.c
@@ -91,7 +91,7 @@ _xcwm_atoms_init(xcwm_context_t *context)
}
/* Set the _NET_SUPPORTED atom for this context
- * Most of these are defined ast MUSTs in the
+ * Most of these are defined as MUSTs in the
* EWMH standards for window managers.
* NOTE: Starting with only a limited set of _NET_WM_STATE. This
* may be expanded. */
@@ -126,7 +126,7 @@ _xcwm_atoms_init(xcwm_context_t *context)
supported);
/* Get the ICCCM atoms we need that are not included in the
- * xcb_ewmh_connetion_t. */
+ * xcb_ewmh_connection_t. */
/* WM_DELETE_WINDOW atom */
context->atoms->wm_delete_window_atom = _xcwm_atom_get(context, "WM_DELETE_WINDOW");
diff --git a/src/libxcwm/context.c b/src/libxcwm/context.c
index 65cc46e..c8e8487 100644
--- a/src/libxcwm/context.c
+++ b/src/libxcwm/context.c
@@ -1,6 +1,6 @@
/* Copyright (c) 2012 David Snyder, Benjamin Carr, Braden Wooley
*
- * rootimg_api.h
+ * context.c
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
diff --git a/src/libxcwm/event_loop.c b/src/libxcwm/event_loop.c
index 6bf6db1..85f19db 100644
--- a/src/libxcwm/event_loop.c
+++ b/src/libxcwm/event_loop.c
@@ -320,7 +320,7 @@ run_event_loop(void *thread_arg_struct)
printf(
"Window %u exposed. Region to be redrawn at location (%d, %d), ",
exevnt->window, exevnt->x, exevnt->y);
- printf("with dimentions (%d, %d).\n", exevnt->width,
+ printf("with dimensions (%d, %d).\n", exevnt->width,
exevnt->height);
return_evt = malloc(sizeof(xcwm_event_t));
diff --git a/src/libxcwm/image.c b/src/libxcwm/image.c
index c275d5b..7b476fa 100644
--- a/src/libxcwm/image.c
+++ b/src/libxcwm/image.c
@@ -85,7 +85,7 @@ xcwm_image_copy_damaged(xcwm_window_t *window)
return NULL;
}
- /* Get the image of the root window */
+ /* Get the image of the damaged area of the window */
image = xcb_image_get(window->context->conn,
window->window_id,
window->dmg_bounds->x,
diff --git a/src/libxcwm/window.c b/src/libxcwm/window.c
index 308830c..18e012b 100644
--- a/src/libxcwm/window.c
+++ b/src/libxcwm/window.c
@@ -444,7 +444,7 @@ init_damage_on_window(xcb_connection_t *conn, xcwm_window_t *window)
window->damage = 0;
return;
}
- /* Assign this damage object to the roots window's context */
+ /* Assign this damage object to the window's context */
window->damage = damage_id;
/* Set the damage area in the context to zero */
diff --git a/src/libxcwm/xcwm_internal.h b/src/libxcwm/xcwm_internal.h
index 8ab8a16..11858f6 100644
--- a/src/libxcwm/xcwm_internal.h
+++ b/src/libxcwm/xcwm_internal.h
@@ -40,11 +40,11 @@
#include <xcwm/xcwm.h>
/**
- * Strucuture used to pass nesessary data to xcwm_start_event_loop.
+ * Structure used to pass necessary data to xcwm_start_event_loop.
*/
-typedef struct xcwm_event_connetion {
+typedef struct xcwm_event_connection {
xcb_connection_t *conn; /* Connection to listen to events on */
- xcwm_event_cb_t event_callback; /* Fuction to call when event caught */
+ xcwm_event_cb_t event_callback; /* Function to call when event caught */
} xcwm_event_connection;
/**
@@ -106,7 +106,7 @@ _xcwm_write_all_children_window_info(xcb_connection_t *conn,
/**
* Get the image data for a window.
* @param conn the connection to the xserver.
- * @param root the window acenstral to all children to be written.
+ * @param root the window ancestral to all children to be written.
* @return a structure containing data and data length.
*/
image_data_t
diff --git a/src/xtoq/XtoqController.m b/src/xtoq/XtoqController.m
index a092f39..c482d82 100644
--- a/src/xtoq/XtoqController.m
+++ b/src/xtoq/XtoqController.m
@@ -476,7 +476,7 @@
// save the newWindow pointer into the context
xcwm_window_set_local_data(window, (id)newWindow);
- // get image to darw
+ // get image to draw
xcbImage = xcwm_image_copy_full(window);
imageRep = [[XtoqImageRep alloc] initWithData: xcbImage x: 0 y: 0];