summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-12-02 21:20:34 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-12-02 21:20:34 -0800
commit226f54f40c66bb170cf54fdc15812a8e4d519db6 (patch)
tree7d4fd7210c175fd48577bc9f08229c4cc61813ab
parentea1923e6c782cf2672d1788149cbcab1387608ea (diff)
Minor spelling and wording fixes for tutorial
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--tutorial/basicwindowsanddrawing.mdwn2
-rw-r--r--tutorial/events.mdwn2
-rw-r--r--tutorial/fonts.mdwn2
-rw-r--r--tutorial/mousecursors.mdwn4
4 files changed, 5 insertions, 5 deletions
diff --git a/tutorial/basicwindowsanddrawing.mdwn b/tutorial/basicwindowsanddrawing.mdwn
index 5c64bbb..e775cd3 100644
--- a/tutorial/basicwindowsanddrawing.mdwn
+++ b/tutorial/basicwindowsanddrawing.mdwn
@@ -411,7 +411,7 @@ TODO: Use screen-> root\_depth for depth parameter.
/* We draw the polygonal line */
xcb_poly_line (connection, XCB_COORD_MODE_PREVIOUS, window, foreground, 4, polyline);
- /* We draw the segements */
+ /* We draw the segments */
xcb_poly_segment (connection, window, foreground, 2, segments);
/* draw the rectangles */
diff --git a/tutorial/events.mdwn b/tutorial/events.mdwn
index 3963e91..1cd506f 100644
--- a/tutorial/events.mdwn
+++ b/tutorial/events.mdwn
@@ -272,7 +272,7 @@ The structure to be checked for in our events loop is the same for these two eve
### 4.4. The keyboard focus
-There may be many windows on a screen, but only a single keyboard attached to them. How does the X server then know which window should be sent a given keyboard input ? This is done using the keyboard focus. Only a single window on the screen may have the keyboard focus at a given time. There is a XCB function that allows a program to set the keyboard focus to a given window. The user can usually set the keyboard focus using the window manager (often by clicking on the title bar of the desired window). Once our window has the keyboard focus, every key press or key release will cause an event to be sent to our program (if it regsitered for these event types...).
+There may be many windows on a screen, but only a single keyboard attached to them. How does the X server then know which window should be sent a given keyboard input ? This is done using the keyboard focus. Only a single window on the screen may have the keyboard focus at a given time. There is a XCB function that allows a program to set the keyboard focus to a given window. The user can usually set the keyboard focus using the window manager (often by clicking on the title bar of the desired window). Once our window has the keyboard focus, every key press or key release will cause an event to be sent to our program (if it registered for these event types...).
### 4.5. Keyboard press and release events
diff --git a/tutorial/fonts.mdwn b/tutorial/fonts.mdwn
index 8fa63b5..8a6222e 100644
--- a/tutorial/fonts.mdwn
+++ b/tutorial/fonts.mdwn
@@ -26,7 +26,7 @@ The fid parameter is the font Id defined by xcb\_generate\_id() (see above). The
### 3. Assigning a Font to a Graphic Context
-Once a font is opened, you have to create a Graphic Context that will contain the informations about the color of the foreground and the background used when you draw a text in a Drawable. Here is an exemple of a Graphic Context that will allow us to draw an opened font with a black foreground and a white background:
+Once a font is opened, you have to create a Graphic Context that will contain the information about the color of the foreground and the background used when you draw a text in a Drawable. Here is an example of a Graphic Context that will allow us to draw an opened font with a black foreground and a white background:
/*
* c is the connection
diff --git a/tutorial/mousecursors.mdwn b/tutorial/mousecursors.mdwn
index 0046a94..8109920 100644
--- a/tutorial/mousecursors.mdwn
+++ b/tutorial/mousecursors.mdwn
@@ -1,6 +1,6 @@
# Messing with the mouse cursor
-It it possible to modify the shape of the mouse pointer (also called the X pointer) when in certain states, as we often see in programs. For example, a busy application would often display the sand clock over its main window, to give the user a visual hint that he should wait. Let's see how we can change the mouse cursor of our windows.
+It it possible to modify the shape of the mouse pointer (also called the X pointer) when in certain states, as we often see in programs. For example, a busy application would often display the sand clock over its main window, to give the user a visual hint that they should wait. Let's see how we can change the mouse cursor of our windows.
### 1. Creating and destroying a mouse cursor
@@ -24,7 +24,7 @@ In the first method, we use a special font named "cursor", and the function xcb\
TODO: Describe source\_char and mask\_char, for example by giving an example on how to get the values. There is a list there: X Font Cursors
-So we first open that font (see Loading a Font) and create the new cursor. As for every X ressource, we have to ask for an X id with xcb\_generate\_id first:
+So we first open that font (see Loading a Font) and create the new cursor. As for every X resource, we have to ask for an X id with xcb\_generate\_id first:
xcb_font_t font = xcb_generate_id (connection);
xcb_open_font (connection, font, strlen ("cursor"), "cursor");