Mon May 12 22:07:45 2003 Michael Jennings (mej)
Use icon window instead of icon pixmap only if strict ICCCM compliance is requested via ./configure --enable-strict-icccm SVN revision: 6904
This commit is contained in:
parent
847cd7f032
commit
5d112d314e
|
@ -5046,3 +5046,8 @@ font list in parallel with the normal font list.
|
||||||
|
|
||||||
Also tweaked the default fonts to be less error-prone.
|
Also tweaked the default fonts to be less error-prone.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Mon May 12 22:07:45 2003 Michael Jennings (mej)
|
||||||
|
|
||||||
|
Use icon window instead of icon pixmap only if strict ICCCM compliance
|
||||||
|
is requested via ./configure --enable-strict-icccm
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -364,6 +364,7 @@
|
||||||
#undef HAVE_SAVED_UIDS
|
#undef HAVE_SAVED_UIDS
|
||||||
#undef MOUSEWHEEL
|
#undef MOUSEWHEEL
|
||||||
#undef ESCREEN
|
#undef ESCREEN
|
||||||
|
#undef STRICT_ICCCM
|
||||||
|
|
||||||
|
|
||||||
/* Leave that blank line there!! Autoheader needs it.
|
/* Leave that blank line there!! Autoheader needs it.
|
||||||
|
|
10
configure.in
10
configure.in
|
@ -302,6 +302,16 @@ if test "x$HAVE_SAVED_UIDS" = "x"; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
AC_MSG_CHECKING(if strict ICCCM compliance should be enabled)
|
||||||
|
AC_ARG_ENABLE(strict-icccm,
|
||||||
|
[ --enable-strict-icccm compile with strict ICCCM compliant WM icon support], [
|
||||||
|
if test "$enableval" = "yes"; then
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(STRICT_ICCCM)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
], AC_MSG_RESULT(no))
|
||||||
|
|
||||||
dnl#
|
dnl#
|
||||||
dnl# X LIBRARIES
|
dnl# X LIBRARIES
|
||||||
|
|
16
src/pixmap.c
16
src/pixmap.c
|
@ -2197,14 +2197,14 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
|
||||||
imlib_context_set_dither(1);
|
imlib_context_set_dither(1);
|
||||||
imlib_context_set_blend(0);
|
imlib_context_set_blend(0);
|
||||||
imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h);
|
imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h);
|
||||||
if (check_for_enlightenment()) {
|
#ifdef STRICT_ICCCM
|
||||||
wm_hints->flags |= IconPixmapHint | IconMaskHint;
|
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, w, h, 0, 0L, 0L);
|
||||||
} else {
|
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
|
||||||
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, w, h, 0, 0L, 0L);
|
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
|
||||||
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
|
wm_hints->flags |= IconWindowHint;
|
||||||
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
|
#else
|
||||||
wm_hints->flags |= IconWindowHint;
|
wm_hints->flags |= IconPixmapHint | IconMaskHint;
|
||||||
}
|
#endif
|
||||||
imlib_free_image_and_decache();
|
imlib_free_image_and_decache();
|
||||||
/* Only set the hints ourselves if we were passed a NULL pointer for pwm_hints */
|
/* Only set the hints ourselves if we were passed a NULL pointer for pwm_hints */
|
||||||
if (!pwm_hints) {
|
if (!pwm_hints) {
|
||||||
|
|
Loading…
Reference in New Issue