diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 16f371e567..a777c22c5e 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,15 @@ +2002-05-01 Matthias Clasen + + * 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 * gtk/gtk-sections.txt: Update for multihead. diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index 95d34006cf..bbbc876190 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -28,7 +28,6 @@ - ]> @@ -42,8 +41,8 @@ &gdk-General; &gdk-Multihead; - &gdk-Screen; &gdk-Display; + &gdk-Screen; &gdk-Points-Rectangles-and-Regions; &gdk-Graphics-Contexts; diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index b60374442f..1298b56583 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -149,6 +149,7 @@ GDK_DISPLAY_GET_CLASS
gdkscreen GdkScreen +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 diff --git a/docs/reference/gdk/multihead.sgml b/docs/reference/gdk/multihead.sgml index bcedf2bfb5..b048d3f5ca 100644 --- a/docs/reference/gdk/multihead.sgml +++ b/docs/reference/gdk/multihead.sgml @@ -1,4 +1,4 @@ - + Multi-head Support Overview 3 @@ -7,9 +7,7 @@ Multi-head Support Overview - Overview of GdkDisplay and GdkScreen + Overview of GdkDisplay and GdkScreen @@ -17,29 +15,31 @@ Multihead support is based around two main object types: - #GdkDisplayManager - #GdkDisplay + GdkDisplay + GdkScreen - #GdkDisplay objects are the Gdk representation of the X Display which can be - described as "a workstation consisting of a keyboard a pointing - device (such as a mouse) and one or more screens". - 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. + GdkDisplay objects are the GDK + representation of the X Display which can be described as a + workstation consisting of a keyboard a pointing device (such as a + mouse) and one or more screens. + It is used to open and keep track of various GdkScreen objects currently + instanciated by the application. It is also used to grab and release + the keyboard and the mouse pointer. - #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. + 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. + the default colormap (gdk_screen_get_default_colormap()), + the screen width (gdk_screen_get_width()), etc. - the following code samples demonstrate common usage of the objects described above + The following code samples demonstrate common usage of the objects described above. @@ -73,14 +73,14 @@ else Opening a second display gchar *second_screen_name; -dkDisplay *second_display; -dkScreen *second_screen; -tkWidget *window; +GdkDisplay *second_display; +GdkScreen *second_screen; +GtkWidget *window; -tk_init (&argc, &argv); +gtk_init (&argc, &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 (&argc, &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); \ No newline at end of file +--> diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml index 72e0640768..7962c66399 100644 --- a/docs/reference/gdk/tmpl/gdkdisplay.sgml +++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml @@ -2,11 +2,11 @@ GdkDisplay -controls the keyboard/mouse pointer grabs and a set of #GdkScreen +controls the keyboard/mouse pointer grabs and a set of GdkScreens -#GdkDisplay objects purpose are two fold : +#GdkDisplay objects purpose are two fold: To grab/ungrab keyboard focus and mouse pointer To manage and provide information about the #GdkScreen(s) @@ -15,11 +15,11 @@ controls the keyboard/mouse pointer grabs and a set of #GdkScreen - #GdkDisplay objects are the Gdk representation of the X Display which can be - described as "a workstation consisting of a keyboard a pointing - device (such as a mouse) and one or more screens". + #GdkDisplay objects are the GDK representation of the X Display which can be + described as a workstation consisting of a keyboard a pointing + device (such as a mouse) and one or more screens. 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. diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml index 87bdd7b056..db18d3e0b5 100644 --- a/docs/reference/gdk/tmpl/gdkscreen.sgml +++ b/docs/reference/gdk/tmpl/gdkscreen.sgml @@ -6,19 +6,31 @@ object representing a physical screen - #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. +Note that a screen may consist of multiple monitors which are merged to +form a large screen area. + + + +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. + + +@parent_instance: + @@ -198,6 +210,8 @@ object representing a physical screen @screen: @monitor_num: +@dest: + @Returns: @@ -218,8 +232,10 @@ object representing a physical screen @screen: -@anid: +@window: @Returns: + +@anid: