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

Supplement the existing WMNormalHints, don't overwrite them.

Browse Source 
Wed Feb 10 10:43:50 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
	 Supplement the existing WMNormalHints, don't
	 overwrite them.
This commit is contained in:
Owen Taylor 1999-02-10 15:45:19 +00:00 committed by Owen Taylor
parent 88c112cde8
commit c9312d02a4
9 changed files with 94 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Feb 10 10:43:50 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_icon, gdk_window_set_group):
Supplement the existing WMNormalHints, don't
overwrite them.
Wed Feb 10 08:35:36 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar): asure that

35
gdk/gdkwindow.c
View File

@ -2008,7 +2008,7 @@ gdk_window_set_icon (GdkWindow *window,
GdkPixmap *pixmap,
GdkBitmap *mask)
{
XWMHints wm_hints;
XWMHints *wm_hints;
GdkWindowPrivate *window_private;
GdkWindowPrivate *private;
@ -2017,30 +2017,33 @@ gdk_window_set_icon (GdkWindow *window,
if (window_private->destroyed)
return;
wm_hints.flags = 0;
wm_hints = XGetWMHints (window_private->xdisplay, window_private->xwindow);
if (!wm_hints)
wm_hints = XAllocWMHints ();
if (icon_window != NULL)
{
private = (GdkWindowPrivate *)icon_window;
wm_hints.flags |= IconWindowHint;
wm_hints.icon_window = private->xwindow;
wm_hints->flags |= IconWindowHint;
wm_hints->icon_window = private->xwindow;
}
if (pixmap != NULL)
{
private = (GdkWindowPrivate *)pixmap;
wm_hints.flags |= IconPixmapHint;
wm_hints.icon_pixmap = private->xwindow;
wm_hints->flags |= IconPixmapHint;
wm_hints->icon_pixmap = private->xwindow;
}
if (mask != NULL)
{
private = (GdkWindowPrivate *)mask;
wm_hints.flags |= IconMaskHint;
wm_hints.icon_mask = private->xwindow;
wm_hints->flags |= IconMaskHint;
wm_hints->icon_mask = private->xwindow;
}
XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints);
XSetWMHints (window_private->xdisplay, window_private->xwindow, wm_hints);
XFree (wm_hints);
}
void
@ -2075,7 +2078,7 @@ void
gdk_window_set_group (GdkWindow *window,
GdkWindow *leader)
{
XWMHints wm_hints;
XWMHints *wm_hints;
GdkWindowPrivate *window_private;
GdkWindowPrivate *private;
@ -2086,10 +2089,16 @@ gdk_window_set_group (GdkWindow *window,
return;
private = (GdkWindowPrivate *)leader;
wm_hints.flags = WindowGroupHint;
wm_hints.window_group = private->xwindow;
XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints);
wm_hints = XGetWMHints (window_private->xdisplay, window_private->xwindow);
if (!wm_hints)
wm_hints = XAllocWMHints ();
wm_hints->flags |= WindowGroupHint;
wm_hints->window_group = private->xwindow;
XSetWMHints (window_private->xdisplay, window_private->xwindow, wm_hints);
XFree (wm_hints);
}
static void

35
gdk/x11/gdkwindow-x11.c
View File

@ -2008,7 +2008,7 @@ gdk_window_set_icon (GdkWindow *window,
GdkPixmap *pixmap,
GdkBitmap *mask)
{
XWMHints wm_hints;
XWMHints *wm_hints;
GdkWindowPrivate *window_private;
GdkWindowPrivate *private;
@ -2017,30 +2017,33 @@ gdk_window_set_icon (GdkWindow *window,
if (window_private->destroyed)
return;
wm_hints.flags = 0;
wm_hints = XGetWMHints (window_private->xdisplay, window_private->xwindow);
if (!wm_hints)
wm_hints = XAllocWMHints ();
if (icon_window != NULL)
{
private = (GdkWindowPrivate *)icon_window;
wm_hints.flags |= IconWindowHint;
wm_hints.icon_window = private->xwindow;
wm_hints->flags |= IconWindowHint;
wm_hints->icon_window = private->xwindow;
}
if (pixmap != NULL)
{
private = (GdkWindowPrivate *)pixmap;
wm_hints.flags |= IconPixmapHint;
wm_hints.icon_pixmap = private->xwindow;
wm_hints->flags |= IconPixmapHint;
wm_hints->icon_pixmap = private->xwindow;
}
if (mask != NULL)
{
private = (GdkWindowPrivate *)mask;
wm_hints.flags |= IconMaskHint;
wm_hints.icon_mask = private->xwindow;
wm_hints->flags |= IconMaskHint;
wm_hints->icon_mask = private->xwindow;
}
XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints);
XSetWMHints (window_private->xdisplay, window_private->xwindow, wm_hints);
XFree (wm_hints);
}
void
@ -2075,7 +2078,7 @@ void
gdk_window_set_group (GdkWindow *window,
GdkWindow *leader)
{
XWMHints wm_hints;
XWMHints *wm_hints;
GdkWindowPrivate *window_private;
GdkWindowPrivate *private;
@ -2086,10 +2089,16 @@ gdk_window_set_group (GdkWindow *window,
return;
private = (GdkWindowPrivate *)leader;
wm_hints.flags = WindowGroupHint;
wm_hints.window_group = private->xwindow;
XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints);
wm_hints = XGetWMHints (window_private->xdisplay, window_private->xwindow);
if (!wm_hints)
wm_hints = XAllocWMHints ();
wm_hints->flags |= WindowGroupHint;
wm_hints->window_group = private->xwindow;
XSetWMHints (window_private->xdisplay, window_private->xwindow, wm_hints);
XFree (wm_hints);
}
static void