Correct filename ~/.pangoft2_aliases

2001-01-08  Alexander Larsson  <alexl@redhat.com>

	* docs/README.linux-fb:
	Correct filename ~/.pangoft2_aliases

	* gdk/gdkwindow.h:
	Added new function gdk_window_get_decorations.

	* gdk/linux-fb/gdkfb.h:
	Removed _gdk_window_get_decorations declaration.
	Renamed _gdk_window_set_child_handler to
	gdk_fb_window_set_child_handler.

	* gdk/linux-fb/gdkwindow-fb.c:
	Renamed _gdk_window_set_child_handler to
	gdk_fb_window_set_child_handler.

	* gdk/x11/gdkwindow-x11.c:
	New function gdk_window_get_mwm_hints().
	Implemented gdk_window_get_decorations.

	* docs/reference/gdk/tmpl/windows.sgml:
	* docs/reference/gdk/gdk-sections.txt:
	Added gdk_window_get_decorations docs.
This commit is contained in:
Alexander Larsson 2001-01-08 16:42:08 +00:00 committed by Alexander Larsson
parent 94dfd3dd82
commit 49bb8dfa19
14 changed files with 250 additions and 13 deletions

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -1,3 +1,28 @@
2001-01-08 Alexander Larsson <alexl@redhat.com>
* docs/README.linux-fb:
Correct filename ~/.pangoft2_aliases
* gdk/gdkwindow.h:
Added new function gdk_window_get_decorations.
* gdk/linux-fb/gdkfb.h:
Removed _gdk_window_get_decorations declaration.
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/linux-fb/gdkwindow-fb.c:
Renamed _gdk_window_set_child_handler to
gdk_fb_window_set_child_handler.
* gdk/x11/gdkwindow-x11.c:
New function gdk_window_get_mwm_hints().
Implemented gdk_window_get_decorations.
* docs/reference/gdk/tmpl/windows.sgml:
* docs/reference/gdk/gdk-sections.txt:
Added gdk_window_get_decorations docs.
2001-01-08 Alexander Larsson <alla@lysator.liu.se> 2001-01-08 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus, * gdk/linux-fb/gdkwindow-fb.c (_gdk_fb_window_find_focus,

View File

@ -50,7 +50,7 @@ To your $prefix/etc/pango/pangorc or ~/.pangorc.
You must also set up font aliases for the fonts Sans, Serif and Monotype. You must also set up font aliases for the fonts Sans, Serif and Monotype.
This is done by creating a $prefix/etc/pango/pangoft2.aliases or This is done by creating a $prefix/etc/pango/pangoft2.aliases or
~/.pangoft2.aliases file. You can also set the name of this file using the ~/.pangoft2_aliases file. You can also set the name of this file using the
key AliasFiles in the PangoFT2 section in pangorc. key AliasFiles in the PangoFT2 section in pangorc.
An example of a font alias file is: An example of a font alias file is:

View File

@ -465,6 +465,7 @@ gdk_window_set_transient_for
gdk_window_set_role gdk_window_set_role
gdk_window_set_group gdk_window_set_group
gdk_window_set_decorations gdk_window_set_decorations
gdk_window_get_decorations
GdkWMDecoration GdkWMDecoration
gdk_window_set_functions gdk_window_set_functions
GdkWMFunction GdkWMFunction

View File

@ -871,6 +871,16 @@ Windows
@decorations: @decorations:
<!-- ##### FUNCTION gdk_window_get_decorations ##### -->
<para>
</para>
@window: The window to get the decorations from
@decorations: The window decorations will be written here
@Returns: TRUE if the window has decorations set, FALSE otherwise.
<!-- ##### ENUM GdkWMDecoration ##### --> <!-- ##### ENUM GdkWMDecoration ##### -->
<para> <para>

View File

@ -388,6 +388,8 @@ void gdk_window_set_group (GdkWindow *window,
GdkWindow *leader); GdkWindow *leader);
void gdk_window_set_decorations (GdkWindow *window, void gdk_window_set_decorations (GdkWindow *window,
GdkWMDecoration decorations); GdkWMDecoration decorations);
gboolean gdk_window_get_decorations (GdkWindow *window,
GdkWMDecoration *decorations);
void gdk_window_set_functions (GdkWindow *window, void gdk_window_set_functions (GdkWindow *window,
GdkWMFunction functions); GdkWMFunction functions);
GList * gdk_window_get_toplevels (void); GList * gdk_window_get_toplevels (void);

View File

@ -32,10 +32,8 @@ typedef void (*GdkWindowChildGetPos) (GdkWindow *window,
gint *x, gint *y, gint *x, gint *y,
gpointer user_data); gpointer user_data);
gboolean _gdk_window_get_decorations (GdkWindow *window, void gdk_fb_window_set_child_handler (GdkWindow *window,
GdkWMDecoration *decorations); GdkWindowChildChanged changed,
void _gdk_window_set_child_handler (GdkWindow *window, GdkWindowChildGetPos get_pos,
GdkWindowChildChanged changed, gpointer user_data);
GdkWindowChildGetPos get_pos,
gpointer user_data);
#endif /* GDKFB_H */ #endif /* GDKFB_H */

View File

@ -1685,10 +1685,10 @@ gdk_window_set_group (GdkWindow *window,
} }
void void
_gdk_window_set_child_handler (GdkWindow *window, gdk_fb_window_set_child_handler (GdkWindow *window,
GdkWindowChildChanged changed, GdkWindowChildChanged changed,
GdkWindowChildGetPos get_pos, GdkWindowChildGetPos get_pos,
gpointer user_data) gpointer user_data)
{ {
GdkWindowChildHandlerData *data; GdkWindowChildHandlerData *data;
@ -1721,8 +1721,8 @@ gdk_window_set_decorations (GdkWindow *window,
} }
gboolean gboolean
_gdk_window_get_decorations(GdkWindow *window, gdk_window_get_decorations(GdkWindow *window,
GdkWMDecoration *decorations) GdkWMDecoration *decorations)
{ {
GdkWMDecoration *dec; GdkWMDecoration *dec;

View File

@ -1851,6 +1851,34 @@ gdk_window_set_group (GdkWindow *window,
XFree (wm_hints); XFree (wm_hints);
} }
static MotifWmHints *
gdk_window_get_mwm_hints (GdkWindow *window)
{
static Atom hints_atom = None;
MotifWmHints *hints;
Atom type;
gint format;
gulong nitems;
gulong bytes_after;
if (GDK_WINDOW_DESTROYED (window))
return NULL;
if (!hints_atom)
hints_atom = XInternAtom (GDK_WINDOW_XDISPLAY (window),
_XA_MOTIF_WM_HINTS, FALSE);
XGetWindowProperty (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window),
hints_atom, 0, sizeof (MotifWmHints)/sizeof (long),
False, AnyPropertyType, &type, &format, &nitems,
&bytes_after, (guchar **)&hints);
if (type == None)
return NULL;
return hints;
}
static void static void
gdk_window_set_mwm_hints (GdkWindow *window, gdk_window_set_mwm_hints (GdkWindow *window,
MotifWmHints *new_hints) MotifWmHints *new_hints)
@ -1913,6 +1941,29 @@ gdk_window_set_decorations (GdkWindow *window,
gdk_window_set_mwm_hints (window, &hints); gdk_window_set_mwm_hints (window, &hints);
} }
gboolean
gdk_window_get_decorations(GdkWindow *window,
GdkWMDecoration *decorations)
{
MotifWmHints *hints;
gboolean result = FALSE;
hints = gdk_window_get_mwm_hints (window);
if (hints)
{
if (hints->flags & MWM_HINTS_DECORATIONS)
{
*decorations = hints->decorations;
result = TRUE;
}
XFree (hints);
}
return result;
}
void void
gdk_window_set_functions (GdkWindow *window, gdk_window_set_functions (GdkWindow *window,
GdkWMFunction functions) GdkWMFunction functions)