Changeset 20931

Timestamp:

11/18/07 13:16:42 (1 year ago)

Author:

patrick

Message:

Fixed coding standard violations. Improved debug output. Wrapped a few long
lines. No functional changes.

Files:

• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowXWin.cpp (modified) (15 diffs)

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowXWin.cpp

@@ -54 +54 @@
-bool InputWindowXWin::config(jccl::ConfigElementPtr e)
-{
-
-
-e->getVersion() < required_definition_ver
+const 
+
+ e->getVersion() < required_definition_ver 
-   {
-      vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_CRITICAL_LVL)
@@ -102 +102 @@
-      << std::endl << vprDEBUG_FLUSH;
-
-NULL == disp_sys_elt.get()
+ NULL == disp_sys_elt.get() 
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CONFIG_LVL)
@@ -139 +139 @@
-   }
-
-
-
+
+
+
+
-      const std::string DISPLAY_str("DISPLAY");
-      vpr::System::getenv(DISPLAY_str, mXDisplayString);
-   }
+
-   return true;
-}
@@ -149 +152 @@
-bool InputWindowXWin::startSampling()
-{
-mThread != NULL
-
-
-
-gadget::InputWindowXWin: startSampling called, when already sampling.\n
-
+ NULL != mThread 
+
+ 
+ 
+[gadget::InputWindowXWin::startSampling] 
+"Called when already sampling.\n" << 
-      vprASSERT(false);
-   }
@@ -184 +187 @@
-{
-   // If there is a thread for us and we actually own the window
-mThread != NULL
+ NULL != mThread 
-   {
-      mExitFlag = true;
@@ -206 +209 @@
-void InputWindowXWin::controlLoop()
-{
-
-gadget::InputWindowXWin::controlLoop:
+ 
+[gadget::InputWindowXWin::controlLoop()]
-      << vprDEBUG_FLUSH;
-
-NULL == vpr::Thread::self()
+ NULL == vpr::Thread::self() 
-   {
-      vpr::System::usleep(50);
-
-gadget::InputWindowXWin: Waiting for (thread::self() != NULL)\n
-
+ 
+[gadget::InputWindowXWin::controlLoop()] 
+"Waiting for (thread::self() != NULL)\n" << 
-   }
-   mThread = (vpr::Thread*) vpr::Thread::self();
@@ -228 +231 @@
-   XSync(mXDisplay, 0);
-
-
-mLockState == Lock_LockKey)      // Means that we are in the initially locked state
-
-
-gadget::InputWindowXWin::controlLoop: Mouse set to initial lock. Locking it now.\n
-
- NULL 
+.
+ mLockState == Lock_LockKey )
+
+ 
+[gadget::InputWindowXWin::controlLoop()] 
+"Mouse set to initial lock. Locking it now.\n" << 
+NULL
-   }
-
-   // Loop on updating
-!mExitFlag
+ ! mExitFlag 
-   {
-      sample();
-
-
-
-
-
+
-   }
-
@@ -259 +258 @@
-   XCloseDisplay((::Display*) mXDisplay);
-}
-
-
-/*****************************************************************/
@@ -269 +267 @@
-bool InputWindowXWin::openLocalWindow()
-{
-   int i;
-
-   mXDisplay = XOpenDisplay(mXDisplayString.c_str());    // Open display on given XDisplay
-NULL == mXDisplay
+ NULL == mXDisplay 
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
@@ -279 +275 @@
-         << "Failed to open display '" << mXDisplayString << "'" << std::endl
-         << vprDEBUG_FLUSH;
-0
+false
-   }
-
-   mScreen = DefaultScreen(mXDisplay);
-
-Template, *vis_infos
-long vMask = VisualScreenMask
-vTemplate.screen = mScreen
-
-
-vis_infos = XGetVisualInfo(mXDisplay, vMask, &vTemplate, &nV
+i_template
+vi_template.screen = mScreen
+int num_visuals(0)
+
+
+                                        &vi_template, &num_v
-
-   // Verify that we got at least one visual from XGetVisualInfo(3).
-V
+um_v
-   {
-      XVisualInfo* p_visinfo;
+      int i;
-
-      // Try to find a visual with color depth of at least 8 bits.  Having
-      // such a visual ensures that the input windows at least have a
-      // black background.
-Visuals; i++, p_visinfo++
+um_visuals; ++i, ++p_visinfo
-      {
-         if ( p_visinfo->depth >= 8 )
@@ -310 +307 @@
-      // If we couldn't find a visual with at least 8-bit color, just use the
-      // first one in the list.
-V
+um_v
-      {
-          mVisual = vis_infos;
@@ -322 +319 @@
-         << ": [gadget::InputWindowXWin::openTheWindow()] find visual failed"
-         << std::endl << vprDEBUG_FLUSH;
-0
+false
-   }
-
@@ -354 +351 @@
-   XFree(vis_infos);
-
-1
+true
-}
-
@@ -408 +405 @@
-   status = XStringListToTextProperty(&window_name, 1, &w_name);
-
-0 == status
+ 0 == status 
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)
@@ -418 +415 @@
-   status = XStringListToTextProperty(&icon_name, 1, &i_name);
-
-0 == status
+ 0 == status 
-   {
-      vprDEBUG(vprDBG_ERROR, vprDBG_CRITICAL_LVL)