Commit 410f3181 authored by Matthias Clasen's avatar Matthias Clasen

Move GdkScreen struct to the GdkScreen section.

	* 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.
parent f7ecb81e
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>
* gtk/gtk-sections.txt: Update for multihead.
......
......@@ -28,7 +28,6 @@
<!entity gdk-X-Window-System-Interaction SYSTEM "sgml/x_interaction.sgml">
<!entity gdk-Screen SYSTEM "sgml/gdkscreen.sgml">
<!entity gdk-Display SYSTEM "sgml/gdkdisplay.sgml">
<!entity gdk-Multihead SYSTEM "multihead.sgml">
]>
......@@ -42,8 +41,8 @@
&gdk-General;
&gdk-Multihead;
&gdk-Screen;
&gdk-Display;
&gdk-Screen;
&gdk-Points-Rectangles-and-Regions;
&gdk-Graphics-Contexts;
......
......@@ -149,6 +149,7 @@ GDK_DISPLAY_GET_CLASS
<SECTION>
<FILE>gdkscreen</FILE>
<TITLE>GdkScreen</TITLE>
GdkScreen
gdk_screen_get_default_colormap
gdk_screen_set_default_colormap
gdk_screen_get_system_colormap
......@@ -564,7 +565,6 @@ GdkWindowEdge
GdkWindowTypeHint
GdkWindowAttr
GdkWindowAttributesType
GdkScreen
gdk_window_new
gdk_window_destroy
gdk_window_ref
......
<refentry id="multihead" revision="20 Mar 2002">
<refentry id="multihead" revision="1 May 2002">
<refmeta>
<refentrytitle>Multi-head Support Overview</refentrytitle>
<manvolnum>3</manvolnum>
......@@ -7,9 +7,7 @@
<refnamediv>
<refname>Multi-head Support Overview</refname>
<refpurpose>Overview of <link
linkend="GdkDisplay">GdkDisplay</link> and <link
linkend="GdkScreen">GdkScreen</link></refpurpose>
<refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
</refnamediv>
<refsect1>
......@@ -17,29 +15,31 @@
<para>
Multihead support is based around two main object types:
<itemizedlist>
<listitem><para>#GdkDisplayManager</para></listitem>
<listitem><para>#GdkDisplay</para></listitem>
<listitem><para>GdkDisplay</para></listitem>
<listitem><para>GdkScreen</para></listitem>
</itemizedlist>
</para>
<para>
#GdkDisplay objects are the Gdk representation of the X Display which can be
described as <emphasis>"a workstation consisting of a keyboard a pointing
device (such as a mouse) and one or more screens"</emphasis>.
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
and the mouse pointer.
<link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
representation of the X Display which can be described as <emphasis>a
workstation consisting of a keyboard a pointing device (such as a
mouse) and one or more screens</emphasis>.
It is used to open and keep track of various <link
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>
#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)
are to be displayed on.
<link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
representation of a physical screen. It is used throughout GDK and GTK+
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
the default colormap (gdk_screen_get_default_colormap()),
the screen width (gdk_screen_get_width()), etc.
the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
</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>
<example>
......@@ -73,14 +73,14 @@ else
<title>Opening a second display</title>
<programlisting><!--
-->gchar *second_screen_name;
dkDisplay *second_display;
dkScreen *second_screen;
tkWidget *window;
GdkDisplay *second_display;
GdkScreen *second_screen;
GtkWidget *window;
tk_init (&amp;argc, &amp;argv);
gtk_init (&amp;argc, &amp;argv);
* screen2_name needs to be initialized before calling
* gdk_display_new() */
/* screen2_name needs to be initialized before calling
/* gdk_display_new() */
second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
if (second_display)
second_screen = gdk_display_get_default_screen (second_display);
......@@ -102,13 +102,13 @@ gtk_window_set_screen (window, second_screen);<!--
<para>
<variablelist>
<varlistentry>
<term>#GdkDisplay</term>
<listitem><para>the Gdk Object used to represent and manipulate display
<term><link linkend="gdk-GdkDisplay">GdkDisplay</link></term>
<listitem><para>the GDK Object used to represent and manipulate display
related data</para></listitem>
</varlistentry>
<varlistentry>
<term>#GdkScreen</term>
<listitem><para>the Gdk Object used to represent and query screen related
<term><link linkend="gdk-GdkScreen">GdkScreen</link></term>
<listitem><para>the GDK Object used to represent and query screen related
data</para></listitem>
</varlistentry>
</variablelist>
......@@ -121,4 +121,4 @@ Local variables:
mode: sgml
sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
End:
-->
\ No newline at end of file
-->
......@@ -2,11 +2,11 @@
GdkDisplay
<!-- ##### 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 ##### -->
<para>
#GdkDisplay objects purpose are two fold :
#GdkDisplay objects purpose are two fold:
<itemizedlist>
<listitem><para>To grab/ungrab keyboard focus and mouse pointer</para></listitem>
<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>
</para>
<para>
#GdkDisplay objects are the Gdk representation of the X Display which can be
described as <emphasis>"a workstation consisting of a keyboard a pointing
device (such as a mouse) and one or more screens"</emphasis>.
#GdkDisplay objects are the GDK representation of the X Display which can be
described as <emphasis>a workstation consisting of a keyboard a pointing
device (such as a mouse) and one or more screens</emphasis>.
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.
</para>
......
......@@ -6,19 +6,31 @@ object representing a physical screen
<!-- ##### SECTION Long_Description ##### -->
<para>
#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)
#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
are to be displayed on.
It is also used to query the screen specification and default settings such as
the default colormap (gdk_screen_get_default_colormap()),
the screen width (gdk_screen_get_width()), etc.
</para>
<para>Note that a screen may consist of multiple monitors which are merged to
form a large screen area.
</para>
<!-- ##### SECTION See_Also ##### -->
<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 ##### -->
<para>
......@@ -198,6 +210,8 @@ object representing a physical screen
@screen:
@monitor_num:
@dest:
<!-- # Unused Parameters # -->
@Returns:
......@@ -218,8 +232,10 @@ object representing a physical screen
</para>
@screen:
@anid:
@window:
@Returns:
<!-- # Unused Parameters # -->
@anid:
<!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment