diff options
| -rw-r--r-- | console-client/bdf.c | 2 | ||||
| -rw-r--r-- | console-client/bdf.h | 2 | ||||
| -rw-r--r-- | console-client/xkb/README | 2 | ||||
| -rw-r--r-- | console-client/xkb/parser.y | 6 | ||||
| -rw-r--r-- | console-client/xkb/xkb.c | 6 | ||||
| -rw-r--r-- | console-client/xkb/xkb.h | 2 | ||||
| -rw-r--r-- | console-client/xkb/xkbdata.c | 6 | ||||
| -rw-r--r-- | console-client/xkb/xkbtimer.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/console-client/bdf.c b/console-client/bdf.c index f62a2473..467c1392 100644 --- a/console-client/bdf.c +++ b/console-client/bdf.c @@ -781,7 +781,7 @@ expand_glyphs (bdf_font_t font, int count) } -/* Add a new glyph with the specified paramters to the font FONT. If +/* Add a new glyph with the specified parameters to the font FONT. If encoding is -1, internal_encoding specifies the internal encoding. All other parameters are mandatory. */ bdf_error_t diff --git a/console-client/bdf.h b/console-client/bdf.h index 17cd0235..f8b6d19b 100644 --- a/console-client/bdf.h +++ b/console-client/bdf.h @@ -243,7 +243,7 @@ bdf_error_t bdf_add_string_property (bdf_font_t font, const char *name, bdf_error_t bdf_add_number_property (bdf_font_t font, const char *name, int value); -/* Add a new glyph with the specified paramters to the font FONT. If +/* Add a new glyph with the specified parameters to the font FONT. If encoding is -1, internal_encoding specifies the internal encoding. All other parameters are mandatory. */ bdf_error_t bdf_add_glyph (bdf_font_t font, const char *name, int encoding, diff --git a/console-client/xkb/README b/console-client/xkb/README index de781143..b8e246a7 100644 --- a/console-client/xkb/README +++ b/console-client/xkb/README @@ -154,7 +154,7 @@ SwitchScreen (screen += 1) --> Switch to the console right of the -- More functions will be added. One to send keysyms to other VCs (can be -usefull to control a mixer, ogg vorbis player, etc.). It should also +useful to control a mixer, ogg vorbis player, etc.). It should also be capable of inserting often used strings like "apfelkorn" :). A function to call the configuration dialog should be added. diff --git a/console-client/xkb/parser.y b/console-client/xkb/parser.y index 27b62145..8f265681 100644 --- a/console-client/xkb/parser.y +++ b/console-client/xkb/parser.y @@ -306,7 +306,7 @@ types: | flags "xkb_types" STR '{' typessect '}' ';' ; -/* A list of virtual modifier declarations (see vmods_def), seperated +/* A list of virtual modifier declarations (see vmods_def), separated by commas. */ vmodslist: IDENTIFIER { vmod_add ($1); } @@ -340,7 +340,7 @@ rmod: | "mod5" { $$ = RMOD_MOD5; } ; -/* One of more modifiers, seperated by '+'. A modmap_t will return all real +/* One of more modifiers, separated by '+'. A modmap_t will return all real and virtual modifiers specified. */ mods: mods '+' rmod { $$.rmods = $1.rmods | $3; } @@ -1317,7 +1317,7 @@ include_section (char *incl, int sectionsymbol, char *dirname, return 0; } -/* Include multiple file sections, seperated by '+'. INCL is the +/* Include multiple file sections, separated by '+'. INCL is the include string. SECTIONSYMBOL is the token that marks the beginning of the section. DIRNAME is the name of the directory from where the includefiles must be loaded. NEW_MM is the mergemode that should be diff --git a/console-client/xkb/xkb.c b/console-client/xkb/xkb.c index 0039714b..bed3da8a 100644 --- a/console-client/xkb/xkb.c +++ b/console-client/xkb/xkb.c @@ -72,7 +72,7 @@ static group_t latchedgroup; static boolctrls bboolctrls; /* A counter to count how often the modifier was set. This is used - when two seperate actions set the same modifier. (example: Left + when two separate actions set the same modifier. (example: Left Shift and Right Shift.). */ modcount_t modsc; @@ -546,7 +546,7 @@ setgroup (keypress_t key, group_t group, int flags) else /* XXX: Maybe oldgroup should be restored for !groupAbsolute too, because wrapgroup might have affected the calculation - and substracting will not undo the set operation. However + and subtracting will not undo the set operation. However this way of handeling relative groups is better because the order of releasing keys when multiple relative setgroup keys are pressed doesn't matter. */ @@ -616,7 +616,7 @@ lockcontrols (keypress_t key, boolctrls ctrls, int flags) else { // clearcontrols (key, boolctrls, flags); - /* This unlock behaviour doesnt work and sucks, just like the protocol + /* This unlock behaviour doesn't work and sucks, just like the protocol specification where it was documented. */ // if (!(flags & noUnlock)) // lboolctrls &= ~keystate[key.keycode].bool; diff --git a/console-client/xkb/xkb.h b/console-client/xkb/xkb.h index 07694930..e38b5ae7 100644 --- a/console-client/xkb/xkb.h +++ b/console-client/xkb/xkb.h @@ -413,7 +413,7 @@ error_t ksrm_add (symbol ks, int rmod); void ksrm_apply (void); /* Set the current rmod for the key with keyname KEYNAME. */ -/* XXX: It shouldn't be applied immediatly because the key can be +/* XXX: It shouldn't be applied immediately because the key can be replaced. */ void set_rmod_keycode (char *keyname, int rmod); diff --git a/console-client/xkb/xkbdata.c b/console-client/xkb/xkbdata.c index 767bf38a..a6e2522f 100644 --- a/console-client/xkb/xkbdata.c +++ b/console-client/xkb/xkbdata.c @@ -14,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -/* Generate a key for the string S. XXX: The are many more effecient - algoritms, this one should be replaced by one of those. */ +/* Generate a key for the string S. XXX: There are many more efficient + algorithms, this one should be replaced by one of those. */ #include <stdlib.h> #include <string.h> @@ -442,7 +442,7 @@ ksrm_apply (void) /* Keycode to realmodifier mapping. */ /* Set the current rmod for the key with keyname KEYNAME. */ -/* XXX: It shouldn't be applied immediatly because the key can be +/* XXX: It shouldn't be applied immediately because the key can be replaced. */ void set_rmod_keycode (char *keyname, int rmod) diff --git a/console-client/xkb/xkbtimer.c b/console-client/xkb/xkbtimer.c index 7621af72..24791e9e 100644 --- a/console-client/xkb/xkbtimer.c +++ b/console-client/xkb/xkbtimer.c @@ -214,7 +214,7 @@ xkb_input_key (int key) } else { - /* Immediatly report the keypress. */ + /* Immediately report the keypress. */ xkb_handle_key (keyc); /* Check if this repeat is allowed for this keycode. */ |