AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Move GdkScreen struct to the GdkScreen section.

Browse Source 
* gdk/gdk-sections.txt: Move GdkScreen struct to the GdkScreen section.

	* gdk/tmpl/gdkscreen.sgml:
	* gdk/tmpl/gdkdisplay.sgml: Typo and markup fixes.

	* gdk/gdk-docs.sgml: Reorder display and screen sections.

	* gdk/multihead.sgml: Remove references to GdkDisplayManager, typo
	and markup fixes.
This commit is contained in:
Matthias Clasen 2002-05-01 21:29:49 +00:00
parent f7ecb81e15
commit 410f31819d
6 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/reference/ChangeLog
View File

@ -1,3 +1,15 @@
2002-05-01 Matthias Clasen <maclas@gmx.de>
* gdk/gdk-sections.txt: Move GdkScreen struct to the GdkScreen section.
* gdk/tmpl/gdkscreen.sgml:
* gdk/tmpl/gdkdisplay.sgml: Typo and markup fixes.
* gdk/gdk-docs.sgml: Reorder display and screen sections.
* gdk/multihead.sgml: Remove references to GdkDisplayManager, typo
and markup fixes.
Tue Apr 30 14:16:12 2002 Owen Taylor <otaylor@redhat.com> Tue Apr 30 14:16:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtk-sections.txt: Update for multihead. * gtk/gtk-sections.txt: Update for multihead.

3
docs/reference/gdk/gdk-docs.sgml
View File

@ -28,7 +28,6 @@
<!entity gdk-X-Window-System-Interaction SYSTEM "sgml/x_interaction.sgml"> <!entity gdk-X-Window-System-Interaction SYSTEM "sgml/x_interaction.sgml">
<!entity gdk-Screen SYSTEM "sgml/gdkscreen.sgml"> <!entity gdk-Screen SYSTEM "sgml/gdkscreen.sgml">
<!entity gdk-Display SYSTEM "sgml/gdkdisplay.sgml"> <!entity gdk-Display SYSTEM "sgml/gdkdisplay.sgml">
<!entity gdk-Multihead SYSTEM "multihead.sgml"> <!entity gdk-Multihead SYSTEM "multihead.sgml">
]> ]>
@ -42,8 +41,8 @@
&gdk-General; &gdk-General;
&gdk-Multihead; &gdk-Multihead;
&gdk-Screen;
&gdk-Display; &gdk-Display;
&gdk-Screen;
&gdk-Points-Rectangles-and-Regions; &gdk-Points-Rectangles-and-Regions;
&gdk-Graphics-Contexts; &gdk-Graphics-Contexts;

2
docs/reference/gdk/gdk-sections.txt
View File

@ -149,6 +149,7 @@ GDK_DISPLAY_GET_CLASS
<SECTION> <SECTION>
<FILE>gdkscreen</FILE> <FILE>gdkscreen</FILE>
<TITLE>GdkScreen</TITLE> <TITLE>GdkScreen</TITLE>
GdkScreen
gdk_screen_get_default_colormap gdk_screen_get_default_colormap
gdk_screen_set_default_colormap gdk_screen_set_default_colormap
gdk_screen_get_system_colormap gdk_screen_get_system_colormap
@ -564,7 +565,6 @@ GdkWindowEdge
GdkWindowTypeHint GdkWindowTypeHint
GdkWindowAttr GdkWindowAttr
GdkWindowAttributesType GdkWindowAttributesType
GdkScreen
gdk_window_new gdk_window_new
gdk_window_destroy gdk_window_destroy
gdk_window_ref gdk_window_ref

58
docs/reference/gdk/multihead.sgml
View File

@ -1,4 +1,4 @@
<refentry id="multihead" revision="20 Mar 2002"> <refentry id="multihead" revision="1 May 2002">
<refmeta> <refmeta>
<refentrytitle>Multi-head Support Overview</refentrytitle> <refentrytitle>Multi-head Support Overview</refentrytitle>
<manvolnum>3</manvolnum> <manvolnum>3</manvolnum>
@ -7,9 +7,7 @@
<refnamediv> <refnamediv>
<refname>Multi-head Support Overview</refname> <refname>Multi-head Support Overview</refname>
<refpurpose>Overview of <link <refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
linkend="GdkDisplay">GdkDisplay</link> and <link
linkend="GdkScreen">GdkScreen</link></refpurpose>
</refnamediv> </refnamediv>
<refsect1> <refsect1>
@ -17,29 +15,31 @@
<para> <para>
Multihead support is based around two main object types: Multihead support is based around two main object types:
<itemizedlist> <itemizedlist>
<listitem><para>#GdkDisplayManager</para></listitem> <listitem><para>GdkDisplay</para></listitem>
<listitem><para>#GdkDisplay</para></listitem> <listitem><para>GdkScreen</para></listitem>
</itemizedlist> </itemizedlist>
</para> </para>
<para> <para>
#GdkDisplay objects are the Gdk representation of the X Display which can be <link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
described as <emphasis>"a workstation consisting of a keyboard a pointing representation of the X Display which can be described as <emphasis>a
device (such as a mouse) and one or more screens"</emphasis>. workstation consisting of a keyboard a pointing device (such as a
It is used to open and keep track of various #GdkScreen objects currently mouse) and one or more screens</emphasis>.
intanciated by the application. It is also used to grab and release the keyboard It is used to open and keep track of various <link
and the mouse pointer. linkend="gdk-GdkScreen">GdkScreen</link> objects currently
instanciated by the application. It is also used to grab and release
the keyboard and the mouse pointer.
</para> </para>
<para> <para>
#GdkScreen objects are the Gdk representation of a physical screen. It is used <link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
throughout Gdk and Gtk+ to specify which screen the top level windows (GtkWindow) representation of a physical screen. It is used throughout GDK and GTK+
are to be displayed on. to specify which screen the top level windows are to be displayed on.
It is also used to query the screen specification and default settings such as It is also used to query the screen specification and default settings such as
the default colormap (gdk_screen_get_default_colormap()), the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
the screen width (gdk_screen_get_width()), etc. the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
</para> </para>
<para> <para>
the following code samples demonstrate common usage of the objects described above The following code samples demonstrate common usage of the objects described above.
</para> </para>
<example> <example>
@ -73,14 +73,14 @@ else
<title>Opening a second display</title> <title>Opening a second display</title>
<programlisting><!-- <programlisting><!--
-->gchar *second_screen_name; -->gchar *second_screen_name;
dkDisplay *second_display; GdkDisplay *second_display;
dkScreen *second_screen; GdkScreen *second_screen;
tkWidget *window; GtkWidget *window;
tk_init (&amp;argc, &amp;argv); gtk_init (&amp;argc, &amp;argv);
* screen2_name needs to be initialized before calling /* screen2_name needs to be initialized before calling
* gdk_display_new() */ /* gdk_display_new() */
second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name); second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
if (second_display) if (second_display)
second_screen = gdk_display_get_default_screen (second_display); second_screen = gdk_display_get_default_screen (second_display);
@ -102,13 +102,13 @@ gtk_window_set_screen (window, second_screen);<!--
<para> <para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term>#GdkDisplay</term> <term><link linkend="gdk-GdkDisplay">GdkDisplay</link></term>
<listitem><para>the Gdk Object used to represent and manipulate display <listitem><para>the GDK Object used to represent and manipulate display
related data</para></listitem> related data</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>#GdkScreen</term> <term><link linkend="gdk-GdkScreen">GdkScreen</link></term>
<listitem><para>the Gdk Object used to represent and query screen related <listitem><para>the GDK Object used to represent and query screen related
data</para></listitem> data</para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -121,4 +121,4 @@ Local variables:
mode: sgml mode: sgml
sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "") sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
End: End:
--> -->

12
docs/reference/gdk/tmpl/gdkdisplay.sgml
View File

@ -2,11 +2,11 @@
GdkDisplay GdkDisplay
<!-- ##### SECTION Short_Description ##### --> <!-- ##### SECTION Short_Description ##### -->
controls the keyboard/mouse pointer grabs and a set of #GdkScreen controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
#GdkDisplay objects purpose are two fold : #GdkDisplay objects purpose are two fold:
<itemizedlist> <itemizedlist>
<listitem><para>To grab/ungrab keyboard focus and mouse pointer</para></listitem> <listitem><para>To grab/ungrab keyboard focus and mouse pointer</para></listitem>
<listitem><para>To manage and provide information about the #GdkScreen(s) <listitem><para>To manage and provide information about the #GdkScreen(s)
@ -15,11 +15,11 @@ controls the keyboard/mouse pointer grabs and a set of #GdkScreen
</itemizedlist> </itemizedlist>
</para> </para>
<para> <para>
#GdkDisplay objects are the Gdk representation of the X Display which can be #GdkDisplay objects are the GDK representation of the X Display which can be
described as <emphasis>"a workstation consisting of a keyboard a pointing described as <emphasis>a workstation consisting of a keyboard a pointing
device (such as a mouse) and one or more screens"</emphasis>. device (such as a mouse) and one or more screens</emphasis>.
It is used to open and keep track of various #GdkScreen objects currently It is used to open and keep track of various #GdkScreen objects currently
intanciated by the application. It is also used to grab and release the keyboard instanciated by the application. It is also used to grab and release the keyboard
and the mouse pointer. and the mouse pointer.
</para> </para>

22
docs/reference/gdk/tmpl/gdkscreen.sgml
View File

@ -6,19 +6,31 @@ object representing a physical screen
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
#GdkScreen objects are the Gdk representation of a physical screen. It is used #GdkScreen objects are the GDK representation of a physical screen. It is used
throughout Gdk and Gtk+ to specify which screen the top level windows (GtkWindow) throughout GDK and GTK+ to specify which screen the top level windows
are to be displayed on. are to be displayed on.
It is also used to query the screen specification and default settings such as It is also used to query the screen specification and default settings such as
the default colormap (gdk_screen_get_default_colormap()), the default colormap (gdk_screen_get_default_colormap()),
the screen width (gdk_screen_get_width()), etc. the screen width (gdk_screen_get_width()), etc.
</para> </para>
<para>Note that a screen may consist of multiple monitors which are merged to
form a large screen area.
</para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
<para> <para>
</para> </para>
<!-- ##### STRUCT GdkScreen ##### -->
<para>
This is a currently just a placeholder typedef for the first argument of
the @window_at_pointer function in #GdkPointerHooks. It will be used
when GDK gets multihead support.
</para>
@parent_instance:
<!-- ##### FUNCTION gdk_screen_get_default_colormap ##### --> <!-- ##### FUNCTION gdk_screen_get_default_colormap ##### -->
<para> <para>
@ -198,6 +210,8 @@ object representing a physical screen
@screen: @screen:
@monitor_num: @monitor_num:
@dest:
<!-- # Unused Parameters # -->
@Returns: @Returns:
@ -218,8 +232,10 @@ object representing a physical screen
</para> </para>
@screen: @screen:
@anid: @window:
@Returns: @Returns:
<!-- # Unused Parameters # -->
@anid:
<!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### --> <!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### -->