add the config header and emacs comment to all the .cc's

diff --git a/otk/application.cc b/otk/application.cc
index 8e4d93b3641fdcaef3273e0890002a4302234789..70f9e24b7565339beccd5e52822679e1a473ddae 100644 (file)
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "application.hh"
 #include "eventhandler.hh"
 #include "widget.hh"

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index f406c654a77275e6f7b6d5b034a92bb964597b24..035a429c001b68ceb4e5f0ed2a6f71ff28251685 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "appwidget.hh"
 #include "application.hh"
 

diff --git a/otk/button.cc b/otk/button.cc
index 1b2ef7cec45efee10b191d5353a1f6da47ac45dc..502a226f2d8033362d682ce5d8d9957c8795468a 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "button.hh"
 
 namespace otk {

diff --git a/otk/display.cc b/otk/display.cc
index 77111d3cbb4f5398d5f121ba896c138cc5986053..7fafed0c092bc3611295042c9d9422a5f398970b 100644 (file)
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 2de283691bf1ed7229118da7cba4f5310efbaa73..30996de003250ba9c5ce3745cc1a435a9378c673 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "eventdispatcher.hh"
 #include "display.hh"
 #include <iostream>

diff --git a/otk/eventdispatcher.hh b/otk/eventdispatcher.hh
index 5e7a1fe484fff6400aa84a7005879c64d567cb07..28741d95bff9d942d46689501a371385824e0c92 100644 (file)
--- a/otk/eventdispatcher.hh
+++ b/otk/eventdispatcher.hh
@@ -28,6 +28,8 @@ private:
   OtkEventMap _map;
   OtkEventHandler *_fallback;
 
+  //! The time at which the last XEvent with a time was received
+  Time _lasttime; // XXX: store this! also provide an accessor!
 };
 
 }

diff --git a/otk/eventhandler.cc b/otk/eventhandler.cc
index 9d37bcff25204e2d911f2788307f4120017f1366..6603b3e13509387c6cd196cb0a720b3109f353a9 100644 (file)
--- a/otk/eventhandler.cc
+++ b/otk/eventhandler.cc
@@ -1,5 +1,11 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
+#include "display.hh"
 #include "eventhandler.hh"
-#include <iostream>
 
 namespace otk {
 
@@ -78,7 +84,19 @@ void OtkEventHandler::handle(const XEvent &e)
     return selectionHandler(e.xselection);
   case SelectionRequest:
     return selectionRequestHandler(e.xselectionrequest);
-  };
+  default:
+#ifdef    SHAPE
+    if (e.type == otk::OBDisplay::shapeEventBase())
+      return shapeHandler((*(XShapeEvent*)&e));
+#endif // SHAPE
+    ;
+  }
+}
+
+
+void OtkEventHandler::clientMessageHandler(const XClientMessageEvent &)
+{
+  
 }
 
 }

diff --git a/otk/eventhandler.hh b/otk/eventhandler.hh
index 05dfac3bc95c92b68176aa0eb8f4c2f56ff230ce..bb4f6d6ba4fae9eee3c9093210e13353fc8bab36 100644 (file)
--- a/otk/eventhandler.hh
+++ b/otk/eventhandler.hh
@@ -3,6 +3,10 @@
 
 extern "C" {
 #include <X11/Xlib.h>
+
+#ifdef    SHAPE
+#include <X11/extensions/shape.h>
+#endif // SHAPE
 }
 
 namespace otk {
@@ -93,9 +97,6 @@ public:
   //! Called when the colormap changes, or is installed or unistalled
   virtual void colorMapHandler(const XColormapEvent &) {}
 
-  //! Called when a client calls XSendEvent
-  virtual void clientMessageHandler(const XClientMessageEvent &) {}
-
   //! Called when a property of a window changes
   virtual void propertyHandler(const XPropertyEvent &) {}
 
@@ -108,6 +109,18 @@ public:
   //! Called when a SelectionEvent occurs
   virtual void selectionRequestHandler(const XSelectionRequestEvent &) {}
 
+  //! Called when a client calls XSendEvent
+  /*!
+    Some types of client messages are filtered out and sent to more specific
+    event handler functions.
+  */
+  virtual void clientMessageHandler(const XClientMessageEvent &);
+
+#if defined(SHAPE) || defined(DOXYGEN_IGNORE)
+  //! Called when a shape extention event fires
+  virtual void shapeHandler(const XShapeEvent &) {};
+#endif // SHAPE 
+
   virtual ~OtkEventHandler();
 
 protected:

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index ea4e9ca20e7a88ab0c5dd8bc7d4d0fd8a2afd5b2..e75a1d33aa6d3fa5cede0c974cd12a208e03f5c8 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "focuslabel.hh"
 
 namespace otk {

diff --git a/otk/focuswidget.cc b/otk/focuswidget.cc
index c21697ce3956a138ce65f542cad5776f171ef979..22a6100ba4d4db3d4717841bbcff72e9586e358d 100644 (file)
--- a/otk/focuswidget.cc
+++ b/otk/focuswidget.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "focuswidget.hh"
 
 namespace otk {

diff --git a/otk/image.cc b/otk/image.cc
index 59c26ae613814faa1c34999fe9a3f479b69212dd..8b4e8ede8481e7323a0f5d13dac5f3f3140c4aad 100644 (file)
--- a/otk/image.cc
+++ b/otk/image.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"

diff --git a/otk/imagecontrol.cc b/otk/imagecontrol.cc
index 8cc6b2afb8750c5b7eabd62946348abaa56e24aa..07b1132c45123ecdc74766c3f961527bd5a4b4b6 100644 (file)
--- a/otk/imagecontrol.cc
+++ b/otk/imagecontrol.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"

diff --git a/otk/label.cc b/otk/label.cc
index 40a85bb39ca922e0ea145b54c3ea3df591f53209..1537b9277a514b736b75c8bf64e9ec949b021729 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "label.hh"
 
 namespace otk {

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 39baa7f6e45a6db6d2e43bde6f61f3d975545db9..495b81d59ff687c425f3c7f748d9be517e936b83 100644 (file)
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "application.hh"
 #include "focuswidget.hh"
 #include "appwidget.hh"

diff --git a/otk/rect.cc b/otk/rect.cc
index bf34970d45534bda764094c5a65447a6aeb452b6..40d369e964863ccbde4b9024e005c3f63fb4990c 100644 (file)
--- a/otk/rect.cc
+++ b/otk/rect.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "rect.hh"
 
 namespace otk {

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index e0a3ca9dc0cedb37868f99f77fa5c15f2d64866b..14faf0c0753c726635f10973f45040780df6cd1b 100644 (file)
--- a/otk/screeninfo.cc
+++ b/otk/screeninfo.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"

diff --git a/otk/style.cc b/otk/style.cc
index 277924d6d9b4e63d90f94c3af57b67d95efde838..89c7b05d5cf0f81408c63b77453feb716696b3d1 100644 (file)
--- a/otk/style.cc
+++ b/otk/style.cc
@@ -1,6 +1,8 @@
-#ifdef    HAVE_CONFIG_H
-#include "../config.h"
-#endif // HAVE_CONFIG_H
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
 
 #include <assert.h>
 #include <iostream>

diff --git a/otk/timer.cc b/otk/timer.cc
index c8e91262876c5ffbfd33f5f18ef74cc8a9173884..2e2205f78fa0d960f58675fadb7fe1ed2e59a2eb 100644 (file)
--- a/otk/timer.cc
+++ b/otk/timer.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"

diff --git a/otk/timerqueuemanager.cc b/otk/timerqueuemanager.cc
index 846648d32d88876dc19118a564e51a55277a2d0c..a37fe94dbca4827e8ccff7aed72f4f090cea140e 100644 (file)
--- a/otk/timerqueuemanager.cc
+++ b/otk/timerqueuemanager.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"

diff --git a/otk/widget.cc b/otk/widget.cc
index 0e5eaf15748c5c2a6b43c9538ff2477ded81be53..79a1f93a4ca2d56597c8bec031eee448dea0978d 100644 (file)
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -1,3 +1,9 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef    HAVE_CONFIG_H
+#  include "../config.h"
+#endif // HAVE_CONFIG_H
+
 #include "widget.hh"
 #include "display.hh"
 #include "assassin.hh"

diff --git a/otk/widget.hh b/otk/widget.hh
index cbf2f9c55922c66dc54f96bea16abe747cca159f..cc6827cfbd32bdc7b49bbbe9e9becbfd5602e87d 100644 (file)
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,9 +1,6 @@
 #ifndef __widget_hh
 #define __widget_hh
 
-#include <string>
-#include <list>
-
 #include "rect.hh"
 #include "point.hh"
 #include "texture.hh"
@@ -11,6 +8,13 @@
 #include "eventdispatcher.hh"
 #include "application.hh"
 
+extern "C" {
+#include <assert.h>
+}
+
+#include <string>
+#include <list>
+
 namespace otk {
 
 class OtkWidget : public OtkEventHandler {
@@ -78,10 +82,10 @@ public:
   virtual void removeChild(OtkWidget *child);
 
   inline bool isStretchableHorz(void) const { return _stretchable_horz; }
-  void setStretchableHorz(bool s_horz) { _stretchable_horz = s_horz; }
+  void setStretchableHorz(bool s_horz = true) { _stretchable_horz = s_horz; }
 
   inline bool isStretchableVert(void) const { return _stretchable_vert; }
-  void setStretchableVert(bool s_vert)  { _stretchable_vert = s_vert; }
+  void setStretchableVert(bool s_vert = true)  { _stretchable_vert = s_vert; }
 
   inline Cursor getCursor(void) const { return _cursor; }
 
@@ -93,7 +97,7 @@ public:
   void setDirection(Direction dir) { _direction = dir; }
 
   inline Style *getStyle(void) const { return _style; }
-  void setStyle(Style *style) { _style = style; }
+  void setStyle(Style *style) { assert(style); _style = style; }
 
   inline OtkEventDispatcher *getEventDispatcher(void)
   { return _event_dispatcher; }