summaryrefslogtreecommitdiff
path: root/gdk/gdkkeyuni.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-09-07 18:07:59 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-09-07 18:07:59 +0000
commit21b538970edd944b694f44e8a7c9f7256dca02d3 (patch)
tree85f42fd7cd923f1bf4e821499808c1c79553c5a9 /gdk/gdkkeyuni.c
parent8c4980ed5439c7c8bd2a4a5383509c4512339f8b (diff)
downloadgtk+-21b538970edd944b694f44e8a7c9f7256dca02d3.tar.gz
Doc comment fixing. (Mostly non-matching parameter names.)
Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c: Doc comment fixing. (Mostly non-matching parameter names.) * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify comments a little to avoid looking like a doc comment. * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to GTK_INPUT_ERROR. (Should the mechanism for erros in spin button conversions be changed to GError?) * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT): Move private #defines into .c file. * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize order of argument addition, remove duplicates. * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass): parent class is FrameClass, not BinClass. * gtk/gtk.h: Add gtkinvisible, which was missing. (It's occasionalyl useful for client apps, if seldom.) * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER #define.
Diffstat (limited to 'gdk/gdkkeyuni.c')
-rw-r--r--gdk/gdkkeyuni.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index b3793cc80f..2c37033c63 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -800,7 +800,7 @@ static struct {
/**
* gdk_keyval_to_unicode:
- * @keysym: a GDK key symbol
+ * @keyval: a GDK key symbol
*
* Convert from a GDK key symbol to the corresponding ISO10646 (Unicode)
* character.
@@ -809,28 +809,28 @@ static struct {
* is no corresponding character.
**/
guint32
-gdk_keyval_to_unicode (guint keysym)
+gdk_keyval_to_unicode (guint keyval)
{
int min = 0;
int max = G_N_ELEMENTS (gdk_keysym_to_unicode_tab) - 1;
int mid;
/* First check for Latin-1 characters (1:1 mapping) */
- if ((keysym >= 0x0020 && keysym <= 0x007e) ||
- (keysym >= 0x00a0 && keysym <= 0x00ff))
- return keysym;
+ if ((keyval >= 0x0020 && keyval <= 0x007e) ||
+ (keyval >= 0x00a0 && keyval <= 0x00ff))
+ return keyval;
/* Also check for directly encoded 24-bit UCS characters:
*/
- if ((keysym & 0xff000000) == 0x01000000)
- return keysym & 0x00ffffff;
+ if ((keyval & 0xff000000) == 0x01000000)
+ return keyval & 0x00ffffff;
/* binary search in table */
while (max >= min) {
mid = (min + max) / 2;
- if (gdk_keysym_to_unicode_tab[mid].keysym < keysym)
+ if (gdk_keysym_to_unicode_tab[mid].keysym < keyval)
min = mid + 1;
- else if (gdk_keysym_to_unicode_tab[mid].keysym > keysym)
+ else if (gdk_keysym_to_unicode_tab[mid].keysym > keyval)
max = mid - 1;
else {
/* found it */