diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-09-03 18:00:40 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-09-03 18:00:40 (GMT) |
commit | 27dc136121a6f97c5fbfeec6b642cf091324def4 (patch) | |
tree | 9b3cdd5350ab9252611eea919bcb46d435992e5e | |
parent | ba03aaaa33af1f405b91e57aa49958547c5ed39f (diff) | |
download | fluxbox-Release-1_1_0_1.zip fluxbox-Release-1_1_0_1.tar.bz2 |
add check to configure script to detect old versions of XrandrRelease-1_1_0_1
-rw-r--r-- | configure.in | 20 | ||||
-rw-r--r-- | src/fluxbox.cc | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 7fbe805..73662ae 100644 --- a/configure.in +++ b/configure.in | |||
@@ -494,6 +494,22 @@ AC_ARG_ENABLE( | |||
494 | LIBS="$LIBS -lXrandr") | 494 | LIBS="$LIBS -lXrandr") |
495 | ) | 495 | ) |
496 | 496 | ||
497 | AC_MSG_CHECKING([whether to have RANDR 1.2 support]) | ||
498 | AC_ARG_ENABLE( | ||
499 | randr1.2, | ||
500 | [ --enable-randr1.2 RANDR 1.2 support ([default=yes])], | ||
501 | if test x$enableval = "xyes"; then | ||
502 | AC_MSG_RESULT([yes]) | ||
503 | AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, | ||
504 | AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support")) | ||
505 | else | ||
506 | AC_MSG_RESULT([no]) | ||
507 | fi, | ||
508 | AC_MSG_RESULT([yes]) | ||
509 | AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, | ||
510 | AC_DEFINE(HAVE_RANDR1_2, 1, "randr 1.2 support")) | ||
511 | ) | ||
512 | |||
497 | dnl Check for Xinerama support | 513 | dnl Check for Xinerama support |
498 | 514 | ||
499 | AC_MSG_CHECKING([whether to build support for the Xinerama extension]) | 515 | AC_MSG_CHECKING([whether to build support for the Xinerama extension]) |
@@ -549,7 +565,7 @@ AC_SUBST(DEFAULT_KEYS) | |||
549 | 565 | ||
550 | AC_ARG_WITH( | 566 | AC_ARG_WITH( |
551 | apps, | 567 | apps, |
552 | [ --with-apps=path location apps file (PREFIX/share/fluxbox/apps)], | 568 | [ --with-apps=path location apps file (PREFIX/share/fluxbox/apps)], |
553 | DEFAULT_APPS=$with_apps, | 569 | DEFAULT_APPS=$with_apps, |
554 | DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps | 570 | DEFAULT_APPS=\$\(prefix\)/share/fluxbox/apps |
555 | ) | 571 | ) |
@@ -557,7 +573,7 @@ AC_SUBST(DEFAULT_APPS) | |||
557 | 573 | ||
558 | AC_ARG_WITH( | 574 | AC_ARG_WITH( |
559 | overlay, | 575 | overlay, |
560 | [ --with-overlay=path location overlay file (PREFIX/share/fluxbox/overlay)], | 576 | [ --with-overlay=path location overlay file (PREFIX/share/fluxbox/overlay)], |
561 | DEFAULT_OVERLAY=$with_overlay, | 577 | DEFAULT_OVERLAY=$with_overlay, |
562 | DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay | 578 | DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay |
563 | ) | 579 | ) |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 27a0b68..3963d89 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -865,7 +865,9 @@ void Fluxbox::handleEvent(XEvent * const e) { | |||
865 | 865 | ||
866 | #ifdef HAVE_RANDR | 866 | #ifdef HAVE_RANDR |
867 | if (e->type == m_randr_event_type) { | 867 | if (e->type == m_randr_event_type) { |
868 | #ifdef HAVE_RANDR1_2 | ||
868 | XRRUpdateConfiguration(e); | 869 | XRRUpdateConfiguration(e); |
870 | #endif | ||
869 | // update root window size in screen | 871 | // update root window size in screen |
870 | BScreen *scr = searchScreen(e->xany.window); | 872 | BScreen *scr = searchScreen(e->xany.window); |
871 | if (scr != 0) | 873 | if (scr != 0) |