summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--configure.in6
2 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 149a633..b96f219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.5: 2Changes for 0.9.5:
3*03/08/22:
4 * Added search path resource for images (Henrik)
5 * session.screen<num>.imageSearchPath
6 This is a list separated by , or space
7 example: session.screen0.imageSearchPath: ~/.fluxbox/pixmaps, /usr/share/fluxbox/pixmaps
8 * Added new files for image loading (Henrik)
9 The new way to load pixmap is to call FbTk::Image::load(thefile, screen_num);
10 and to add more image file support you just have to extend FbTk::ImageBase
11 and register it to FbTk::Image
12 Image.hh/cc, ImageXPM.hh/cc, PixmapWithMask.hh, Theme.cc, WinButtonTheme.hh/cc,
13 WinButton.cc/hh, fluxbox.cc
14 * Fixed scaling in WinButtonTheme (Henrik)
15 WinButton.cc, Screen.cc WinButtonTheme.hh/cc
16 * Added new theme item window.title.height, Window.Title.Height (Henrik)
17 FbWinFrameTheme.hh/cc
3*03/08/19: 18*03/08/19:
4 * Added ResizeVertical and ResizeHorizontal (Thanks Mathias Gumz) 19 * Added ResizeVertical and ResizeHorizontal (Thanks Mathias Gumz)
5 CurrentWindowCmd.hh/cc, FbCommandFactory.cc 20 CurrentWindowCmd.hh/cc, FbCommandFactory.cc
diff --git a/configure.in b/configure.in
index 680881e..781f9ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
1dnl Initialize autoconf and automake 1dnl Initialize autoconf and automake
2AC_INIT(src/main.cc) 2AC_INIT(src/main.cc)
3AC_PREREQ(2.52) 3AC_PREREQ(2.52)
4AM_INIT_AUTOMAKE(fluxbox,0.9.5, no-define) 4AM_INIT_AUTOMAKE(fluxbox,0.9.5pre1, no-define)
5 5
6dnl Determine default prefix 6dnl Determine default prefix
7test x$prefix = "xNONE" && prefix="$ac_default_prefix" 7test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -354,6 +354,7 @@ AC_ARG_ENABLE(
354 LIBS="$LIBS -lXrender") 354 LIBS="$LIBS -lXrender")
355) 355)
356 356
357XPM=false
357AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support]) 358AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support])
358AC_ARG_ENABLE( 359AC_ARG_ENABLE(
359 xpm, 360 xpm,
@@ -362,6 +363,7 @@ AC_ARG_ENABLE(
362 AC_MSG_RESULT([yes]) 363 AC_MSG_RESULT([yes])
363 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, 364 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
364 AC_DEFINE(HAVE_XPM, 1, "Xpm support") 365 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
366 XPM=true
365 LIBS="$LIBS -lXpm") 367 LIBS="$LIBS -lXpm")
366 else 368 else
367 AC_MSG_RESULT([no]) 369 AC_MSG_RESULT([no])
@@ -369,9 +371,11 @@ AC_ARG_ENABLE(
369 AC_MSG_RESULT([yes]) 371 AC_MSG_RESULT([yes])
370 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, 372 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
371 AC_DEFINE(HAVE_XPM, 1, "Xpm support") 373 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
374 XPM=true
372 LIBS="$LIBS -lXpm") 375 LIBS="$LIBS -lXpm")
373) 376)
374 377
378AM_CONDITIONAL(XPM, test x$XPM = xtrue)
375 379
376AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support]) 380AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
377AC_ARG_ENABLE( 381AC_ARG_ENABLE(