fix #489, #493, and other misc bugs

Author: Koen Deforche

CMakeLists.txt

@@ -216,22 +216,6 @@ ELSE(DEBUG)
   SET(WT_DEBUG_ENABLED 0)
 ENDIF(DEBUG)
 
-# Compile time constants & make sure our build finds it
-FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Wt)
-SET(WCONFIG_H_PATH ${CMAKE_CURRENT_BINARY_DIR}/Wt/WConfig.h)
-CONFIGURE_FILE(
-  ${WT_SOURCE_DIR}/WConfig.h.in
-  ${WCONFIG_H_PATH}
-)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INSTALL_FILES(/include/Wt FILES ${WCONFIG_H_PATH})
-
-# Generate wt_config.xml from wt_config.xml.in
-CONFIGURE_FILE(
-  ${WT_SOURCE_DIR}/wt_config.xml.in
-  ${WT_BINARY_DIR}/wt_config.xml
-)
-
 ADD_CUSTOM_TARGET(doc)
 
 IF (ASCIIDOC_FOUND)
@@ -279,3 +263,28 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/resources DESTINATION
 IF(NOT EXISTS ${CONFIGDIR}/wt_config.xml)
   INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
 ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
+
+IF(HARU_FOUND)
+  SET(WT_HAS_WPDFIMAGE true)
+ENDIF(HARU_FOUND)
+
+IF(GM_FOUND)
+  SET(WT_HAS_WRASTERIMAGE true)
+ENDIF(GM_FOUND)
+
+# Compile time constants & make sure our build finds it
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Wt)
+SET(WCONFIG_H_PATH ${CMAKE_CURRENT_BINARY_DIR}/Wt/WConfig.h)
+CONFIGURE_FILE(
+  ${WT_SOURCE_DIR}/WConfig.h.in
+  ${WCONFIG_H_PATH}
+)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+INSTALL_FILES(/include/Wt FILES ${WCONFIG_H_PATH})
+
+# Generate wt_config.xml from wt_config.xml.in
+CONFIGURE_FILE(
+  ${WT_SOURCE_DIR}/wt_config.xml.in
+  ${WT_BINARY_DIR}/wt_config.xml
+)
+

WConfig.h.in

@@ -26,6 +26,9 @@
 #cmakedefine WT_EXT_STATIC
 #cmakedefine WT_EXT_STATIC
 
+#cmakedefine WT_HAS_WRASTERIMAGE
+#cmakedefine WT_HAS_WPDFIMAGE
+
 #if ${WT_DEBUG_ENABLED}
 #ifndef WT_TARGET_JAVA
   #define WT_DEBUG(statement) do { if (Wt::WApplication::instance()->debug()) statement; } while(0)

examples/feature/socketnotifier/SocketNotifier.C

@@ -33,6 +33,10 @@ typedef int socklen_t;
  * This is a minimal socket notifier example, which is used to asynchronously
  * read an RSS file and display it in raw format on the browser using server
  * push.
+ * Note that when the SocketNotifier signal is emitted, that Wt already
+ * conveniently grabbed the update lock for you. You can simply modify
+ * the widget tree and use the server push mechanism to push the changes
+ * to the browser.
  * The example looks unnecessary complex due to the use of the raw POSIX
  * socket functions. Usually these are wrapped in a more programmer-friendly
  * API.
@@ -72,11 +76,9 @@ private:
   Wt::WText *rssText_;
   std::stringstream inStream_;
 
-  // Convenience function that updates the status message. It grabs
-  // the updateLock before doing so, so it is safe to call at any time.
+  // Convenience function that updates the status message.
   void addText(const Wt::WString &text)
   {
-    Wt::WApplication::UpdateLock uiLock = wApp->getUpdateLock();
     resultText_->setText(resultText_->text() + text);
     if (wApp->updatesEnabled())
       wApp->triggerUpdate();
@@ -237,9 +239,6 @@ private:
 
   void cleanup()
   {
-    // We'll be modifying the widget tree
-    Wt::WApplication::UpdateLock uiLock = wApp->getUpdateLock();
-
     /*
      * It is mandatory not to have notifiers on closed sockets,
      * as select() fails miserably in this case. Disable (or even

examples/widgetgallery/sintel_trailer.jpg

@@ -23,7 +23,7 @@ WT_ADD_EXAMPLE(Home.wt
         ../blog/view/BlogView.C
 	../blog/view/CommentView.C
 	../blog/view/PostView.C
-	../blog/view/EditUsers.C
+  	../blog/view/EditUsers.C
 	../blog/model/Comment.C
 	../blog/model/Post.C
 	../blog/model/Tag.C

examples/wt-homepage/CMakeLists.txt

@@ -86,7 +86,7 @@ class WTemplate;
 
 .Wt-cal td          : Day cell
 .Wt-cal-oom         : Out-of-month day
-.Wt-cal-oom         : Out-of-range day (day < bottom or day > top)
+.Wt-cal-oor         : Out-of-range day (day < bottom or day > top)
 .Wt-cal-sel         : Selected day
 .Wt-cal-now         : Today day
 \endverbatim

src/Wt/WCalendar

@@ -283,13 +283,6 @@ DomElementType WTemplate::domElementType() const
 
 void WTemplate::refresh()
 {
-  for (WidgetMap::const_iterator i = widgets_.begin(); i != widgets_.end();
-       ++i) {
-    WWidget *w = i->second;
-    if (w->isRendered())
-      w->refresh();
-  }
-
   if (text_.refresh()) {
     changed_ = true;
     repaint(RepaintInnerHtml);

src/Wt/WTemplate.C

@@ -89,10 +89,10 @@ void WVmlImage::init()
   currentShadow_ = painter()->shadow();
   penBrushShadowChanged_ = true;
 
-  startClip(WRectF(0, 0, width().value(), height().value()));
-
   if (!(paintFlags_ & PaintUpdate))
     rendered_.str(std::string());
+
+  startClip(WRectF(0, 0, width().value(), height().value()));
 }
 
 void WVmlImage::done()

src/Wt/WVmlImage.C

@@ -94,7 +94,9 @@ void WWidget::renderOk()
 {
   if (flags_.test(BIT_NEED_RERENDER)) {
     flags_.reset(BIT_NEED_RERENDER);
-    WApplication::instance()->session()->renderer().doneUpdate(this);
+    WApplication *app = WApplication::instance();
+    if (app)
+      app->session()->renderer().doneUpdate(this);
   }
 }
 
@@ -359,7 +361,7 @@ void WWidget::setLayoutSizeAware(bool aware)
   if (aware == (resized_ != 0))
     return;
 
-  if (aware) {
+  if (aware && WApplication::instance()) {
     resized_ = new JSignal<int, int>(this, "resized");
     resized_->connect(this, &WContainerWidget::layoutSizeChanged);
 

src/Wt/WWidget.C

@@ -57,9 +57,6 @@ Server::Server(const Configuration& config, const Wt::Configuration& wtConfig,
     ssl_context_(io_service_, asio::ssl::context::sslv23),
     ssl_acceptor_(io_service_),
 #endif // HTTP_WITH_SSL
-#if defined(WT_THREADED) && BOOST_VERSION < 103600
-    select_reactor_(io_service_),
-#endif // defined(WT_THREADED) && BOOST_VERSION < 103600
     connection_manager_(),
     request_handler_(config, wtConfig.entryPoints(),
 		     accessLogger_),