Typo fix. Updates. Document the special values <none> and <parent> for

* gdk/x11/gdkinput.c: Typo fix.
        * gdk/tmpl/input_devices.sgml: Updates.
        * gtk/tmpl/gtkrc.sgml: Document the special values <none> and
        <parent> for bg_pixmap.
This commit is contained in:
Matthias Clasen 2001-10-27 20:41:05 +00:00
parent ec0997df71
commit 5b10c877c1
11 changed files with 86 additions and 42 deletions

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,7 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/x11/gdkinput.c: Typo fix.
2001-10-26 Havoc Pennington <hp@pobox.com> 2001-10-26 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call

View File

@ -1,3 +1,10 @@
2001-10-27 Matthias Clasen <matthiasc@poet.de>
* gdk/tmpl/input_devices.sgml: Updates.
* gtk/tmpl/gtkrc.sgml: Document the special values <none> and
<parent> for bg_pixmap.
2001-10-27 Anders Carlsson <andersca@gnu.org> 2001-10-27 Anders Carlsson <andersca@gnu.org>
* gtk/tmpl/gtkaccellabel.sgml: Clarify that the string * gtk/tmpl/gtkaccellabel.sgml: Clarify that the string

View File

@ -27,7 +27,7 @@ a cursor itself, it can ask only to get extension events
from devices that will display a cursor, by passing the from devices that will display a cursor, by passing the
%GDK_EXTENSION_EVENTS_CURSOR value to %GDK_EXTENSION_EVENTS_CURSOR value to
gdk_input_set_extension_events(). Otherwise, the application gdk_input_set_extension_events(). Otherwise, the application
must retrieve the device information using gdk_input_list_devices(), must retrieve the device information using gdk_devices_list(),
check the <structfield>has_cursor</structfield> field, and, check the <structfield>has_cursor</structfield> field, and,
if it is %FALSE, draw a cursor itself when it receives if it is %FALSE, draw a cursor itself when it receives
motion events. motion events.
@ -43,7 +43,7 @@ information reported as additional <firstterm>valuators</firstterm>
from the device. The <structfield>pressure</structfield> field is a from the device. The <structfield>pressure</structfield> field is a
a double value ranging from 0.0 to 1.0, while the tilt fields are a double value ranging from 0.0 to 1.0, while the tilt fields are
double values ranging from -1.0 to 1.0. (With -1.0 representing the double values ranging from -1.0 to 1.0. (With -1.0 representing the
maximum title to the left or up, and 1.0 representing the maximum maximum tilt to the left or up, and 1.0 representing the maximum
tilt to the right or down.) tilt to the right or down.)
</para> </para>
<para> <para>
@ -61,24 +61,24 @@ settings.
</para> </para>
<para> <para>
Various aspects of each device may be configured. The easiest way of Various aspects of each device may be configured. The easiest way of
creating a GUI to allow the user to conifigure such a device creating a GUI to allow the user to configure such a device
is to use to use the #GtkInputDialog widget in GTK+. is to use the #GtkInputDialog widget in GTK+.
However, even when using this widget, application writers However, even when using this widget, application writers
will need to directly query and set the configuration parameters will need to directly query and set the configuration parameters
in order to save the state between invocations of the application. in order to save the state between invocations of the application.
The configuration of devices is queried using gdk_input_list_devices. The configuration of devices is queried using gdk_devices_list().
Each device must is activated using gdk_input_set_mode(), which Each device must be activated using gdk_device_set_mode(), which
also controls whether the device's range is mapped to the also controls whether the device's range is mapped to the
entire screen or to a single window. The mapping of the valuators of entire screen or to a single window. The mapping of the valuators of
the device onto the predefined valuator types is set using the device onto the predefined valuator types is set using
gdk_input_set_axes. And the source type for each device gdk_device_set_axis_use(). And the source type for each device
can be set with gdk_input_set_source(). can be set with gdk_device_set_source().
</para> </para>
<para> <para>
Devices may also have associated <firstterm>keys</firstterm> Devices may also have associated <firstterm>keys</firstterm>
or macro buttons. Such keys can be globally set to map or macro buttons. Such keys can be globally set to map
into normal X keyboard events. The mapping is set using into normal X keyboard events. The mapping is set using
gdk_input_set_key(). gdk_device_set_key().
</para> </para>
<para> <para>
The interfaces in this section will most likely be considerably The interfaces in this section will most likely be considerably
@ -171,74 +171,80 @@ types that GTK+ understands.
@GDK_AXIS_PRESSURE: the axis is used for pressure information. @GDK_AXIS_PRESSURE: the axis is used for pressure information.
@GDK_AXIS_XTILT: the axis is used for x tilt information. @GDK_AXIS_XTILT: the axis is used for x tilt information.
@GDK_AXIS_YTILT: the axis is used for x tilt information. @GDK_AXIS_YTILT: the axis is used for x tilt information.
@GDK_AXIS_WHEEL: @GDK_AXIS_WHEEL: the axis is used for wheel information.
@GDK_AXIS_LAST: a constant equal to the numerically highest axis value. @GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
<!-- ##### FUNCTION gdk_devices_list ##### --> <!-- ##### FUNCTION gdk_devices_list ##### -->
<para> <para>
Returns the list of available input devices. The list is statically
allocated and should not be freed.
</para> </para>
@Returns: @Returns: a list of #GdkDevice*.
<!-- ##### FUNCTION gdk_device_set_source ##### --> <!-- ##### FUNCTION gdk_device_set_source ##### -->
<para> <para>
Sets the source type for an input device.
</para> </para>
@device: @device: a #GdkDevice.
@source: @source: the source type.
<!-- ##### FUNCTION gdk_device_set_mode ##### --> <!-- ##### FUNCTION gdk_device_set_mode ##### -->
<para> <para>
Sets a the mode of an input device. The mode controls if the
device is active and whether the device's range is mapped to the
entire screen or to a single window.
</para> </para>
@device: @device: a #GdkDevice.
@mode: @mode: the input mode.
@Returns: @Returns: %TRUE if the mode was successfully changed.
<!-- ##### FUNCTION gdk_device_set_key ##### --> <!-- ##### FUNCTION gdk_device_set_key ##### -->
<para> <para>
Specifies the X key event to generate when a macro button of a device
is pressed.
</para> </para>
@device: @device: a #GdkDevice.
@index: @index: the index of the macro button to set.
@keyval: @keyval: the keyval to generate.
@modifiers: @modifiers: the modifiers to set.
<!-- ##### FUNCTION gdk_device_set_axis_use ##### --> <!-- ##### FUNCTION gdk_device_set_axis_use ##### -->
<para> <para>
Specifies how an axis of a device is used.
</para> </para>
@device: @device: a #GdkDevice.
@index: @index: the index of the axis.
@use: @use: specifies how the axis is used.
<!-- ##### FUNCTION gdk_device_get_core_pointer ##### --> <!-- ##### FUNCTION gdk_device_get_core_pointer ##### -->
<para> <para>
Returns the device for the core pointer. The device is statically
allocated and should not be freed.
</para> </para>
@Returns: @Returns: a #GdkDevice.
<!-- ##### FUNCTION gdk_device_get_state ##### --> <!-- ##### FUNCTION gdk_device_get_state ##### -->
<para> <para>
Gets the current state of a device.
</para> </para>
@device: @device: a #GdkDevice.
@window: @window: a #GdkWindow.
@axes: @axes: an array of doubles to store the values of the axes of @device in,
@mask: or %NULL.
@mask: location to store the modifiers, or %NULL.
<!-- ##### FUNCTION gdk_device_get_history ##### --> <!-- ##### FUNCTION gdk_device_get_history ##### -->
@ -257,11 +263,11 @@ types that GTK+ understands.
<!-- ##### FUNCTION gdk_device_free_history ##### --> <!-- ##### FUNCTION gdk_device_free_history ##### -->
<para> <para>
Frees an array of #GdkTimeCoord that was returned by gdk_device_get_history().
</para> </para>
@events: @events: an array of #GdkTimeCoord.
@n_events: @n_events: the length of the array.
<!-- ##### STRUCT GdkTimeCoord ##### --> <!-- ##### STRUCT GdkTimeCoord ##### -->

View File

@ -238,13 +238,16 @@ elements are:
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><literal>bg_text[<replaceable>state</replaceable>] = <term><literal>bg_pixmap[<replaceable>state</replaceable>] =
<replaceable>color</replaceable></literal></term> <replaceable>pixmap</replaceable></literal></term>
<listitem> <listitem>
<para> <para>
Set a background pixmap to be used in place of Set a background pixmap to be used in place of
the <literal>bg</literal> color (or for #GtkText, the <literal>bg</literal> color (or for #GtkText,
in place of the <literal>base</literal> color. in place of the <literal>base</literal> color. The special
value "<parent>" may be used to indicate that the widget should
use the same background pixmap as its parent. The special value
"<none>" may be used to indicate no background pixmap.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -364,7 +364,7 @@ _gdk_input_exit (void)
* Interprets an array of double as axis values for a given device, * Interprets an array of double as axis values for a given device,
* and locates the value in the array for a given axis use. * and locates the value in the array for a given axis use.
* *
* Return value: %TRUE if the given axis use was found, otherwies %FALSE * Return value: %TRUE if the given axis use was found, otherwise %FALSE
**/ **/
gboolean gboolean
gdk_device_get_axis (GdkDevice *device, gdk_device_get_axis (GdkDevice *device,