diff --git a/ChangeLog b/ChangeLog index dba3318321..e99ebced84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dba3318321..e99ebced84 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2001-10-27 Matthias Clasen + + * gdk/x11/gdkinput.c: Typo fix. + 2001-10-26 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 68367e1dc8..52fc1be14a 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +2001-10-27 Matthias Clasen + + * gdk/tmpl/input_devices.sgml: Updates. + + * gtk/tmpl/gtkrc.sgml: Document the special values and + for bg_pixmap. + 2001-10-27 Anders Carlsson * gtk/tmpl/gtkaccellabel.sgml: Clarify that the string diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml index f85c323080..09254c542a 100644 --- a/docs/reference/gdk/tmpl/input_devices.sgml +++ b/docs/reference/gdk/tmpl/input_devices.sgml @@ -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 %GDK_EXTENSION_EVENTS_CURSOR value to 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 has_cursor field, and, if it is %FALSE, draw a cursor itself when it receives motion events. @@ -43,7 +43,7 @@ information reported as additional valuators from the device. The pressure field is a 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 -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.) @@ -61,24 +61,24 @@ settings. Various aspects of each device may be configured. The easiest way of -creating a GUI to allow the user to conifigure such a device -is to use to use the #GtkInputDialog widget in GTK+. +creating a GUI to allow the user to configure such a device +is to use the #GtkInputDialog widget in GTK+. However, even when using this widget, application writers will need to directly query and set the configuration parameters in order to save the state between invocations of the application. -The configuration of devices is queried using gdk_input_list_devices. -Each device must is activated using gdk_input_set_mode(), which +The configuration of devices is queried using gdk_devices_list(). +Each device must be activated using gdk_device_set_mode(), which also controls whether the device's range is mapped to the entire screen or to a single window. The mapping of the valuators of the device onto the predefined valuator types is set using -gdk_input_set_axes. And the source type for each device -can be set with gdk_input_set_source(). +gdk_device_set_axis_use(). And the source type for each device +can be set with gdk_device_set_source(). Devices may also have associated keys or macro buttons. Such keys can be globally set to map into normal X keyboard events. The mapping is set using -gdk_input_set_key(). +gdk_device_set_key(). 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_XTILT: 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. - +Returns the list of available input devices. The list is statically +allocated and should not be freed. -@Returns: +@Returns: a list of #GdkDevice*. - +Sets the source type for an input device. -@device: -@source: +@device: a #GdkDevice. +@source: the source type. - +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. -@device: -@mode: -@Returns: +@device: a #GdkDevice. +@mode: the input mode. +@Returns: %TRUE if the mode was successfully changed. - +Specifies the X key event to generate when a macro button of a device +is pressed. -@device: -@index: -@keyval: -@modifiers: +@device: a #GdkDevice. +@index: the index of the macro button to set. +@keyval: the keyval to generate. +@modifiers: the modifiers to set. - +Specifies how an axis of a device is used. -@device: -@index: -@use: +@device: a #GdkDevice. +@index: the index of the axis. +@use: specifies how the axis is used. - +Returns the device for the core pointer. The device is statically +allocated and should not be freed. -@Returns: +@Returns: a #GdkDevice. - +Gets the current state of a device. -@device: -@window: -@axes: -@mask: +@device: a #GdkDevice. +@window: a #GdkWindow. +@axes: an array of doubles to store the values of the axes of @device in, + or %NULL. +@mask: location to store the modifiers, or %NULL. @@ -257,11 +263,11 @@ types that GTK+ understands. - +Frees an array of #GdkTimeCoord that was returned by gdk_device_get_history(). -@events: -@n_events: +@events: an array of #GdkTimeCoord. +@n_events: the length of the array. diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 9aa21d3cc3..5eb3682aa6 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -238,13 +238,16 @@ elements are: - bg_text[state] = - color + bg_pixmap[state] = + pixmap Set a background pixmap to be used in place of the bg color (or for #GtkText, - in place of the base color. + in place of the base color. The special + value "" may be used to indicate that the widget should + use the same background pixmap as its parent. The special value + "" may be used to indicate no background pixmap. diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index 4f16a4f62a..13f7722e21 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -364,7 +364,7 @@ _gdk_input_exit (void) * Interprets an array of double as axis values for a given device, * 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 gdk_device_get_axis (GdkDevice *device,