Commit c117408d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Update for multihead.

Tue Apr 30 12:26:31 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk-sections.txt: Update for multihead.

        * multihead.sgml gtk-docs.sgml:	Add overview of
	multihead from	multihead branch.

	* tmpl/gdkdisplay.sgml	tmpl/gdkscreen.sgml: New
        sections from multihead	branch.
parent 683de881
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
......@@ -13,8 +13,11 @@
unrefs the tag table first, so that the btree is in a consistent
state when we're removing tags from it.
* gtk/gtktexttagtable.c (_gtk_text_tag_table_remove_buffer): strip
all tags in the tag table out of the buffer. #77301
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
......
Tue Apr 30 12:26:31 2002 Owen Taylor <otaylor@redhat.com>
* gdk-sections.txt: Update for multihead.
* multihead.sgml gtk-docs.sgml: Add overview of
multihead from multihead branch.
* tmpl/gdkdisplay.sgml tmpl/gdkscreen.sgml: New
sections from multihead branch.
2002-04-30 Havoc Pennington <hp@redhat.com>
* gtk/other_software.sgml: half-finished docs on merging GTK with
......
......@@ -26,6 +26,10 @@
<!entity gdk-Input SYSTEM "sgml/input.sgml">
<!entity gdk-Drag-and-Drop SYSTEM "sgml/dnd.sgml">
<!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">
]>
<book id="index">
......@@ -37,6 +41,10 @@
<title>API Reference</title>
&gdk-General;
&gdk-Multihead;
&gdk-Screen;
&gdk-Display;
&gdk-Points-Rectangles-and-Regions;
&gdk-Graphics-Contexts;
&gdk-Drawing-Primitives;
......
......@@ -6,6 +6,8 @@
<FILE>general</FILE>
gdk_init
gdk_init_check
gdk_parse_args
gdk_get_display_arg_name
gdk_set_locale
gdk_set_sm_client_id
gdk_exit
......@@ -110,6 +112,78 @@ gdk_wm_decoration_get_type
gdk_wm_function_get_type
</SECTION>
<SECTION>
<FILE>gdkdisplay</FILE>
<TITLE>GdkDisplay</TITLE>
GdkDisplay
gdk_open_display
gdk_display_get_name
gdk_display_get_n_screens
gdk_display_get_screen
gdk_display_get_default_screen
gdk_display_pointer_ungrab
gdk_display_keyboard_ungrab
gdk_display_pointer_is_grabbed
gdk_display_beep
gdk_display_sync
gdk_display_close
gdk_display_list_devices
gdk_display_get_event
gdk_display_peek_event
gdk_display_put_event
gdk_display_add_client_message_filter
gdk_display_set_double_click_time
gdk_display_set_sm_client_id
gdk_set_default_display
gdk_get_default_display
<SUBSECTION Standard>
GDK_DISPLAY_OBJECT
GDK_IS_DISPLAY
GDK_TYPE_DISPLAY
gdk_display_get_type
GDK_DISPLAY_CLASS
GDK_IS_DISPLAY_CLASS
GDK_DISPLAY_GET_CLASS
</SECTION>
<SECTION>
<FILE>gdkscreen</FILE>
<TITLE>GdkScreen</TITLE>
gdk_screen_get_default_colormap
gdk_screen_set_default_colormap
gdk_screen_get_system_colormap
gdk_screen_get_system_visual
gdk_screen_get_rgb_colormap
gdk_screen_get_rgb_visual
gdk_screen_get_root_window
gdk_screen_get_display
gdk_screen_get_number
gdk_screen_get_window_at_pointer
gdk_screen_get_width
gdk_screen_get_height
gdk_screen_get_width_mm
gdk_screen_get_height_mm
gdk_screen_close
gdk_screen_list_visuals
gdk_screen_get_toplevel_windows
gdk_screen_use_virtual_screen
gdk_screen_get_n_monitors
gdk_screen_get_monitor_geometry
gdk_screen_get_monitor_at_point
gdk_screen_get_monitor_at_window
gdk_screen_broadcast_client_message
gdk_get_default_screen
gdk_screen_get_setting
<SUBSECTION Standard>
GDK_SCREEN
GDK_IS_SCREEN
GDK_TYPE_SCREEN
gdk_screen_get_type
GDK_SCREEN_CLASS
GDK_IS_SCREEN_CLASS
GDK_SCREEN_GET_CLASS
</SECTION>
<SECTION>
<TITLE>Bitmaps and Pixmaps</TITLE>
<FILE>pixmaps</FILE>
......@@ -274,8 +348,12 @@ gdk_color_get_type
GdkFont
GdkFontType
gdk_font_load
gdk_font_load_for_display
gdk_fontset_load
gdk_fontset_load_for_display
gdk_font_from_description
gdk_font_from_description_for_display
gdk_font_get_display
gdk_font_ref
gdk_font_unref
gdk_font_id
......@@ -322,6 +400,8 @@ gdk_drawable_ref
gdk_drawable_unref
gdk_drawable_set_data
gdk_drawable_get_data
gdk_drawable_get_display
gdk_drawable_get_screen
gdk_drawable_get_visual
gdk_drawable_set_colormap
gdk_drawable_get_colormap
......@@ -380,6 +460,7 @@ GdkFunction
gdk_gc_new
gdk_gc_new_with_values
gdk_gc_get_screen
gdk_gc_ref
gdk_gc_unref
gdk_gc_destroy
......@@ -648,10 +729,13 @@ GDK_SELECTION_TYPE_PIXMAP
GDK_SELECTION_TYPE_WINDOW
GDK_SELECTION_TYPE_STRING
gdk_selection_owner_set
gdk_selection_owner_set_for_display
gdk_selection_owner_get
gdk_selection_owner_get_for_display
gdk_selection_convert
gdk_selection_property_get
gdk_selection_send_notify
gdk_selection_send_notify_for_display
</SECTION>
<SECTION>
......@@ -662,12 +746,16 @@ GDK_ATOM_TO_POINTER
GDK_POINTER_TO_ATOM
GDK_NONE
gdk_text_property_to_text_list
gdk_text_property_to_text_list_for_display
gdk_free_text_list
gdk_text_property_to_utf8_list
gdk_text_property_to_utf8_list_for_display
gdk_string_to_compound_text
gdk_string_to_compound_text_for_display
gdk_free_compound_text
gdk_utf8_to_string_target
gdk_utf8_to_compound_text
gdk_utf8_to_compound_text_for_display
gdk_atom_intern
gdk_atom_name
gdk_property_get
......@@ -683,6 +771,7 @@ GDK_TYPE_PROP_MODE
<TITLE>Pango Interaction</TITLE>
<FILE>pango_interaction</FILE>
gdk_pango_context_get
gdk_pango_context_get_for_screen
gdk_pango_context_set_colormap
GdkPangoAttrEmbossed
GdkPangoAttrStipple
......@@ -759,6 +848,7 @@ gdk_threads_mutex
GdkKeymap
GdkKeymapKey
gdk_keymap_get_default
gdk_keymap_get_for_display
gdk_keymap_lookup_key
gdk_keymap_translate_keyboard_state
gdk_keymap_get_entries_for_keyval
......@@ -868,6 +958,7 @@ GdkEventFunc
<SUBSECTION>
gdk_event_send_client_message
gdk_event_send_client_message_for_display
gdk_event_send_clientmessage_toall
gdk_add_client_message_filter
......@@ -939,6 +1030,8 @@ GdkCursor
GdkCursorType
gdk_cursor_new
gdk_cursor_new_from_pixmap
gdk_cursor_new_for_screen
gdk_cursor_get_screen
gdk_cursor_ref
gdk_cursor_unref
gdk_cursor_destroy
......@@ -979,6 +1072,7 @@ gdk_drag_begin
gdk_drag_motion
gdk_drop_finish
gdk_drag_get_protocol
gdk_drag_get_protocol_for_display
GdkDragProtocol
gdk_drag_context_unref
GdkDragContext
......@@ -1010,6 +1104,7 @@ GDK_WINDOW_XDISPLAY
GDK_WINDOW_XID
GDK_PIXMAP_XDISPLAY
GDK_PIXMAP_XID
GDK_DISPLAY_XDISPLAY
GDK_DRAWABLE_XDISPLAY
GDK_DRAWABLE_XID
GDK_IMAGE_XDISPLAY
......@@ -1017,6 +1112,9 @@ GDK_IMAGE_XIMAGE
GDK_GC_XDISPLAY
GDK_COLORMAP_XDISPLAY
GDK_COLORMAP_XCOLORMAP
GDK_SCREEN_XDISPLAY
GDK_SCREEN_XNUMBER
GDK_SCREEN_XSCREEN
GDK_VISUAL_XVISUAL
GDK_FONT_XDISPLAY
GDK_FONT_XFONT
......@@ -1026,19 +1124,29 @@ GDK_GC_XGC
GDK_GC_GET_XGC
GDK_WINDOW_XWINDOW
gdkx_visual_get
gdkx_visual_get_for_screen
gdkx_colormap_get
gdk_pixmap_foreign_new
gdk_pixmap_foreign_new_for_display
gdk_window_foreign_new
gdk_window_foreign_new_for_display
gdk_xid_table_lookup
gdk_xid_table_lookup_for_display
gdk_window_lookup
gdk_window_lookup_for_display
gdk_pixmap_lookup
gdk_pixmap_lookup_for_display
gdk_font_lookup
gdk_font_lookup_for_display
gdk_x11_lookup_xdisplay
gdk_x11_get_server_time
gdk_net_wm_supports
gdk_x11_screen_supports_net_wm_hint
gdk_x11_colormap_get_xcolormap
gdk_x11_colormap_get_xdisplay
gdk_x11_cursor_get_xcursor
gdk_x11_cursor_get_xdisplay
gdk_x11_display_get_xdisplay
gdk_x11_drawable_get_xdisplay
gdk_x11_drawable_get_xid
gdk_x11_font_get_name
......@@ -1052,12 +1160,18 @@ gdk_x11_get_default_xdisplay
gdk_x11_grab_server
gdk_x11_image_get_xdisplay
gdk_x11_image_get_ximage
gdk_x11_screen_get_screen_number
gdk_x11_screen_get_xscreen
gdk_x11_ungrab_server
gdk_x11_visual_get_xvisual
gdk_x11_atom_to_xatom
gdk_x11_atom_to_xatom_for_display
gdk_x11_xatom_to_atom
gdk_x11_xatom_to_atom_for_display
gdk_x11_get_xatom_by_name
gdk_x11_get_xatom_by_name_for_display
gdk_x11_get_xatom_name
gdk_x11_get_xatom_name_for_display
<SUBSECTION Private>
gdk_display
......
<refentry id="multihead" revision="20 Mar 2002">
<refmeta>
<refentrytitle>Multi-head Support Overview</refentrytitle>
<manvolnum>3</manvolnum>
<refmiscinfo>GDK Library</refmiscinfo>
</refmeta>
<refnamediv>
<refname>Multi-head Support Overview</refname>
<refpurpose>Overview of <link
linkend="GdkDisplay">GdkDisplay</link> and <link
linkend="GdkScreen">GdkScreen</link></refpurpose>
</refnamediv>
<refsect1>
<title>Overview</title>
<para>
Multihead support is based around two main object types:
<itemizedlist>
<listitem><para>#GdkDisplayManager</para></listitem>
<listitem><para>#GdkDisplay</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.
</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.
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>
the following code samples demonstrate common usage of the objects described above
</para>
<example>
<title>Testing the number of screen on the current display</title>
<programlisting><!--
-->gint num_screen = 0;
gchar *displayname = NULL;
GdkScreen **screen_list;
GdkDisplay *display;
gtk_init (&amp;argc, &amp;argv);
display = gdk_get_default_display ();
num_screen = gdk_display_get_n_screens (display);
displayname = gdk_display_get_name (display);
if (num_screen <= 1)
{
printf ("This Xserver (%s) manages only one screen. exiting...\n",
displayname);
exit (1);
}
else
{
printf ("This Xserver (%s) manages %d screens.\n", displayname,
num_screen);
}<!--
--> </programlisting>
</example>
<example>
<title>Opening a second display</title>
<programlisting><!--
-->gchar *second_screen_name;
dkDisplay *second_display;
dkScreen *second_screen;
tkWidget *window;
tk_init (&amp;argc, &amp;argv);
* 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);
else
{
g_print ("Can't open display :\n\t%s\n\n",
second_screen_name);
exit (1);
}
/* now GdkScreen can be assigned to GtkWindows */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_screen (window, second_screen);<!--
--></programlisting>
</example>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
<variablelist>
<varlistentry>
<term>#GdkDisplay</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
data</para></listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
</refentry>
<!--
Local variables:
mode: sgml
sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
End:
-->
\ No newline at end of file
......@@ -103,7 +103,7 @@ Creates a new colormap for the given visual.
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_colormap_get_system_size ##### -->
......
......@@ -171,6 +171,25 @@ The color does not have to be allocated first.
@Returns: a new #GdkCursor.
<!-- ##### FUNCTION gdk_cursor_new_for_screen ##### -->
<para>
</para>
@screen:
@cursor_type:
@Returns:
<!-- ##### FUNCTION gdk_cursor_get_screen ##### -->
<para>
</para>
@cursor:
@Returns:
<!-- ##### FUNCTION gdk_cursor_ref ##### -->
<para>
......
......@@ -162,6 +162,17 @@ Finds out the DND protocol supported by a window.
support Drag and Drop.
<!-- ##### FUNCTION gdk_drag_get_protocol_for_display ##### -->
<para>
</para>
@display:
@xid:
@protocol:
@Returns:
<!-- ##### ENUM GdkDragProtocol ##### -->
<para>
Used in #GdkDragContext to indicate the protocol according to
......
......@@ -72,6 +72,24 @@ or a #GdkWindow.
@Returns:
<!-- ##### FUNCTION gdk_drawable_get_display ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_drawable_get_screen ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_drawable_get_visual ##### -->
<para>
......
......@@ -151,43 +151,44 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_event_peek ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_event_get ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_event_get_graphics_expose ##### -->
<para>
</para>
@window:
@Returns:
@window:
@Returns:
<!-- ##### FUNCTION gdk_event_put ##### -->
<para>
</para>
@event:
@event:
<!-- ##### FUNCTION gdk_event_copy ##### -->
<para>
</para>
@event:
@Returns:
@event:
@Returns:
<!-- ##### FUNCTION gdk_event_free ##### -->
......@@ -201,8 +202,8 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
@event:
@Returns:
@event:
@Returns:
<!-- ##### FUNCTION gdk_event_get_state ##### -->
......@@ -252,9 +253,9 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
@func:
@data:
@notify:
@func:
@data:
@notify:
<!-- ##### USER_FUNCTION GdkEventFunc ##### -->
......@@ -272,16 +273,27 @@ gdk_event_handler_set().
<para>
</para>
@event:
@xid:
@Returns:
@event:
@xid:
@Returns:
<!-- ##### FUNCTION gdk_event_send_client_message_for_display ##### -->
<para>
</para>
@display:
@event:
@xid:
@Returns:
<!-- ##### FUNCTION gdk_event_send_clientmessage_toall ##### -->
<para>
</para>
@event:
@event:
<!-- ##### FUNCTION gdk_add_client_message_filter ##### -->
......@@ -289,30 +301,30 @@ gdk_event_handler_set().
</para>
@message_type:
@func:
@data:
@func:
@data:
<!-- ##### FUNCTION gdk_get_show_events ##### -->
<para>
</para>
@Returns:
@Returns:
<!-- ##### FUNCTION gdk_set_show_events ##### -->
<para>
</para>
@show_events:
@show_events:
<!-- ##### FUNCTION gdk_setting_get ##### -->
<para>
</para>
@name:
@value:
@Returns:
@name:
@value:
@Returns:
......@@ -299,6 +299,16 @@ You should make no assumptions about the initial reference count.
@Returns: a #GdkFont, or %NULL if the font could not be loaded.
<!-- ##### FUNCTION gdk_font_load_for_display ##### -->
<para>
</para>
@display:
@font_name:
@Returns:
<!-- ##### FUNCTION gdk_fontset_load ##### -->
<para>
Loads a fontset.
......@@ -313,6 +323,16 @@ You should make no assumptions about the initial reference count.
@Returns: a #GdkFont, or %NULL if the fontset could not be loaded.
<!-- ##### FUNCTION gdk_fontset_load_for_display ##### -->
<para>
</para>
@display:
@fontset_name:
@Returns:
<!-- ##### FUNCTION gdk_font_from_description ##### -->
<para>
......@@ -322,6 +342,25 @@ You should make no assumptions about the initial reference count.
@Returns:
<!-- ##### FUNCTION gdk_font_from_description_for_display ##### -->
<para>
</para>
@display:
@font_desc:
@Returns:
<!-- ##### FUNCTION gdk_font_get_display ##### -->
<para>