Reorganise mouse data in Message objects

diff --git a/boxx.cc b/boxx.cc
index f3f6afff8b313f172b5bc83926f517cf442f5c3f..e0d092fb2dcbdacaef07bc6f49c719d5c73d9466 100644 (file)
--- a/boxx.cc
+++ b/boxx.cc
@@ -598,12 +598,12 @@ bool Boxx::mouseLBDOWN(int x, int y)
 
 bool Boxx::coordsOutsideBox(Message* m)
 {
-  /* Helper function to look at parameter in m, decode the x and y coords
+  /* Helper function to look at x and y in m
    * and see if the point is outside this Boxx's area
    */
 
-  int x = (m->parameter >> 16) - getScreenX();
-  int y = (m->parameter & 0xFFFF) - getScreenY();
+  int x = m->parameter - getScreenX();
+  int y = m->tag - getScreenY();
 
   if (     (x < 0)
         || (y < 0)

diff --git a/vaudioselector.cc b/vaudioselector.cc
index de94e9ccdffbb2f673371c4f727fc246a512d376..142565d68438a480c6d23cc831d93b5941986062 100644 (file)
--- a/vaudioselector.cc
+++ b/vaudioselector.cc
@@ -534,7 +534,7 @@ void VAudioSelector::processMessage(Message* m)
   {
     int lastsel = asl.getCurrentOption();
 
-    if (((m->parameter >> 16) - getScreenX()) < 200 && asl.mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    if ((m->parameter - getScreenX()) < 200 && asl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       editsubtitles = false;
       ssl.setDarkSelOption(true);
@@ -559,7 +559,7 @@ void VAudioSelector::processMessage(Message* m)
 
     lastsel = ssl.getCurrentOption();
 
-    if (ssl.mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    if (ssl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       editsubtitles = true;
       ssl.setDarkSelOption(false);
@@ -584,7 +584,7 @@ void VAudioSelector::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (asl.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    if (asl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       editsubtitles = false;
       ssl.setDarkSelOption(true);
@@ -593,7 +593,7 @@ void VAudioSelector::processMessage(Message* m)
       ssl.draw();
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
-    else if (ssl.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    else if (ssl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       editsubtitles = true;
       ssl.setDarkSelOption(false);
@@ -605,8 +605,8 @@ void VAudioSelector::processMessage(Message* m)
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x = (m->parameter >> 16) - getScreenX();
-      int y = (m->parameter & 0xFFFF) - getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
 
       if (x < 0 || y < 0 || x > static_cast<int>(getWidth()) || y > static_cast<int>(getHeight()))
       {

diff --git a/vchannellist.cc b/vchannellist.cc
index 7c33c16b89582ea4bea5e7fae0af59c275bbbae7..8067efd8c4ebafed5bf5ff1567d634f387ebf540 100644 (file)
--- a/vchannellist.cc
+++ b/vchannellist.cc
@@ -270,7 +270,7 @@ void VChannelList::processMessage(Message* m)
   }
   else */if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       quickUpdate();
       boxstack->update(this);
@@ -278,7 +278,7 @@ void VChannelList::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vepg.cc b/vepg.cc
index 72bd1f93f4ff9455dbf52e4f7bd444d3ed058df6..6607ee1f370fe0e99198456c338bc292669d6a7c 100644 (file)
--- a/vepg.cc
+++ b/vepg.cc
@@ -763,7 +763,7 @@ void VEpg::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (chanListbox.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (chanListbox.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       drawData();
       boxstack->update(this);
@@ -771,15 +771,15 @@ void VEpg::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (chanListbox.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (chanListbox.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       int keyx = chanListbox.getRootBoxOffsetX();
       int keyy = chanListbox.getRootBoxOffsetY() + chanListbox.getHeight() + 2;
 

diff --git a/vepglistadvanced.cc b/vepglistadvanced.cc
index cd3c15ca3cf2356160cebd8a359677ebcd03600d..ed01b89baabad7e11901d58dfd4e70c1fe331f13 100644 (file)
--- a/vepglistadvanced.cc
+++ b/vepglistadvanced.cc
@@ -921,7 +921,7 @@ void VEpgListAdvanced::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       quickUpdate();
       boxstack->update(this);
@@ -929,23 +929,25 @@ void VEpgListAdvanced::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    int x = m->parameter - getScreenX();
+    int y = m->tag - getScreenY();
+    if (sl.mouseLBDOWN(x, y))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }
-    else if (boxRed.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    else if (boxRed.mouseLBDOWN(x, y))
     {
       boxstack->handleCommand(Input::RED);
     }
-    else if (boxGreen.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    else if (boxGreen.mouseLBDOWN(x, y))
     {
-      boxstack->handleCommand(Input::GREEN);
+      boxstack->handleCommand(Input::GREEN); // FIXME all these green? is this right?
     }
-    else if (boxYellow.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    else if (boxYellow.mouseLBDOWN(x, y))
     {
       boxstack->handleCommand(Input::GREEN);
     }
-    else if (boxBlue.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+    else if (boxBlue.mouseLBDOWN(x, y))
     {
       boxstack->handleCommand(Input::GREEN);
     }

diff --git a/vepgsettimer.cc b/vepgsettimer.cc
index b6f74b37ae4fd7b47b1529786b404f5d66ce712e..59704d9cb464ea2d1ca4d5e748faceae68b4c5d8 100644 (file)
--- a/vepgsettimer.cc
+++ b/vepgsettimer.cc
@@ -286,14 +286,14 @@ void VEpgSetTimer::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (buttonYes.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (buttonYes.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       buttonNo.setActive(0);
       selectedOption = YES;
       draw();
       boxstack->update(this);
     }
-    else if (buttonNo.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    else if (buttonNo.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       buttonYes.setActive(0);
       selectedOption = NO;
@@ -303,11 +303,11 @@ void VEpgSetTimer::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (buttonYes.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (buttonYes.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }
-    else if (buttonNo.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    else if (buttonNo.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vepgsummary.cc b/vepgsummary.cc
index 4262dc98fe98c3feff7ca3a06c221194a1dbff0e..42fb17e5e441808396733c2652880f64407cc9a3 100644 (file)
--- a/vepgsummary.cc
+++ b/vepgsummary.cc
@@ -206,7 +206,7 @@ void VEpgSummary::processMessage(Message* m)
 {
        if (m->message == Message::MOUSE_MOVE)
        {
-               if (tabbar.mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+               if (tabbar.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
                {
                        BoxStack::getInstance()->update(this);
                }
@@ -214,8 +214,8 @@ void VEpgSummary::processMessage(Message* m)
        else if (m->message == Message::MOUSE_LBDOWN)
        {
                int cancel = true;
-               int x = (m->parameter >> 16) - getScreenX();
-               int y = (m->parameter & 0xFFFF) - getScreenY();
+               int x = m->parameter - getScreenX();
+               int y = m->tag - getScreenY();
 
                if ((boxRed.getX() <= x) && (boxRed.getX() + (int)boxRed.getWidth() >= x) &&
                                (boxRed.getY() <= y) && (boxRed.getY() + (int)boxRed.getHeight() >= y)) {
@@ -224,7 +224,7 @@ void VEpgSummary::processMessage(Message* m)
                }
 
 
-               if (cancel && tabbar.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+               if (cancel && tabbar.mouseLBDOWN(x, y))
                {
                        BoxStack::getInstance()->update(this);
                        cancel = false;
@@ -236,10 +236,10 @@ void VEpgSummary::processMessage(Message* m)
             BoxStack::getInstance()->handleCommand(Input::BACK); //simulate cancel press
           }
                }
-       } else if (m->message == Message::MOUSE_SCROLL)
+       }
+       else if (m->message == Message::MOUSE_SCROLL)
        {
-               if (tabbar.mouseAndroidScroll((m->tag >> 16) - getScreenX(), (m->tag & 0xFFFF) - getScreenY(),
-                               (short)(m->parameter >> 16), (short)(m->parameter & 0xFFFF)))
+               if (tabbar.mouseAndroidScroll(m->parameter - getScreenX(), m->tag - getScreenY(), 0, reinterpret_cast<ULONG>(m->data)))
                {
                        BoxStack::getInstance()->update(this);
                        return;

diff --git a/vmedialist.cc b/vmedialist.cc
index 1db39aaccec1de2699b4976a3089bdc2a65118df..47b21d2f25401382e647130adf99c0146c1ed4ad 100644 (file)
--- a/vmedialist.cc
+++ b/vmedialist.cc
@@ -1064,7 +1064,7 @@ void VMediaList::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.draw();
       doShowingBar();
@@ -1074,7 +1074,7 @@ void VMediaList::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       updateSelection();
       boxstack->handleCommand(Input::OK); //simulate OK press

diff --git a/vopts.cc b/vopts.cc
index 95c5fbf2e2baeaec2f6b549de08397d078ea0c39..8a96f73b623ab45ed9885947769c8c5b61d0e199 100644 (file)
--- a/vopts.cc
+++ b/vopts.cc
@@ -492,19 +492,15 @@ void VOpts::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    int x=(m->parameter>>16)-getScreenX();
-    int y=(m->parameter&0xFFFF)-getScreenY();
-    if (tabbar.mouseMove(x,y))
-    {
-      BoxStack::getInstance()->update(this);
-    }
-    
+    int x = m->parameter - getScreenX();
+    int y = m->tag - getScreenY();
+    if (tabbar.mouseMove(x, y)) BoxStack::getInstance()->update(this);
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    int x=(m->parameter>>16)-getScreenX();
-    int y=(m->parameter&0xFFFF)-getScreenY();
-    if (tabbar.mouseLBDOWN(x,y)) 
+    int x = m->parameter - getScreenX();
+    int y = m->tag - getScreenY();
+    if (tabbar.mouseLBDOWN(x, y))
     {
       BoxStack::getInstance()->update(this);
     } 
@@ -514,4 +510,3 @@ void VOpts::processMessage(Message* m)
     }
   }
 }
-

diff --git a/vpicturebanner.cc b/vpicturebanner.cc
index ad91656b772f834a858c5b7f6b24aea946aceb08..5a99be4e2a5ae7f1f2c30d619ed6ade374d5fc7b 100644 (file)
--- a/vpicturebanner.cc
+++ b/vpicturebanner.cc
@@ -104,8 +104,8 @@ void VPictureBanner::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    int x = (m->parameter >> 16) - getScreenX();
-    int y = (m->parameter & 0xFFFF) - getScreenY();
+    int x = m->parameter - getScreenX();
+    int y = m->tag - getScreenY();
 
     if (coordsOutsideBox(m))
     {

diff --git a/vquestion.cc b/vquestion.cc
index c0d0b87f859341c9bdd110440cdd3ea5bd50ba6d..d9f52ebf8048f78b7e51b4e3037418e261a200c7 100644 (file)
--- a/vquestion.cc
+++ b/vquestion.cc
@@ -124,14 +124,14 @@ void VQuestion::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (buttonYes.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (buttonYes.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       buttonNo.setActive(0);
       selectedOption = YES;
       draw();
       BoxStack::getInstance()->update(this);
     }
-    else if (buttonNo.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    else if (buttonNo.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       buttonYes.setActive(0);
       selectedOption = NO;
@@ -141,11 +141,11 @@ void VQuestion::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (buttonYes.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (buttonYes.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
-    else if (buttonNo.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    else if (buttonNo.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vradiorec.cc b/vradiorec.cc
index 71d243c8502d163fe6670af87cc541e3ad64680e..fc5466216fdd7180a8c8c2f27cf71c11aa37f1f8 100644 (file)
--- a/vradiorec.cc
+++ b/vradiorec.cc
@@ -274,8 +274,8 @@ void VRadioRec::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_LBDOWN)
   {
-    int x=(m->parameter>>16)-(int)getScreenX();
-    int y=(m->parameter&0xFFFF)-(int)getScreenY();
+    int x = m->parameter - (int)getScreenX();
+    int y = m->tag - (int)getScreenY();
     if (!barShowing)
     {
       boxstack->handleCommand(Input::OK); //simulate rok press

diff --git a/vrecmove.cc b/vrecmove.cc
index 425abdbb217c169bd7a24190583c479103a1747e..527dfdd20357c1131063fc0e815bba2e4e7bc0de 100644 (file)
--- a/vrecmove.cc
+++ b/vrecmove.cc
@@ -146,7 +146,7 @@ void VRecMove::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.draw();
       BoxStack::getInstance()->update(this);
@@ -154,7 +154,7 @@ void VRecMove::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vrecording.cc b/vrecording.cc
index 9c763cd6264784bfa1bbf3fa674857d097b2411f..3ae8b984a5df22b0d9cf119390b0ab89f40bf0ee 100644 (file)
--- a/vrecording.cc
+++ b/vrecording.cc
@@ -373,20 +373,20 @@ void VRecording::processMessage(Message* m)
   {
     for (int i = PLAY; i < last; i++)
     {
-         if (button[i].mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+      if (button[i].mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
       {
         for (int j = PLAY; j < last; j++)
           button[j].setActive(0);
         button[i].setActive(1);
-               tabbar.activateFocus(false);
-               buttons = true;
+        tabbar.activateFocus(false);
+        buttons = true;
         selected=i;
         draw();
         BoxStack::getInstance()->update(this);
         break;
       }
     }
-       if (tabbar.mouseMove((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+       if (tabbar.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
        {
                BoxStack::getInstance()->update(this);
                return;
@@ -394,8 +394,7 @@ void VRecording::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_SCROLL)
   {
-         if (tabbar.mouseAndroidScroll((m->tag >> 16) - getScreenX(), (m->tag & 0xFFFF) - getScreenY(),
-                 (short)(m->parameter >> 16), (short) (m->parameter & 0xFFFF)))
+         if (tabbar.mouseAndroidScroll(m->parameter - getScreenX(), m->tag - getScreenY(), 0, reinterpret_cast<ULONG>(m->data)))
          {
                  BoxStack::getInstance()->update(this);
                  return;
@@ -406,7 +405,7 @@ void VRecording::processMessage(Message* m)
     int cancel = true;
     for (int i = PLAY; i < last; i++)
     {
-      if (button[i].mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+      if (button[i].mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
       {
         BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
                buttons = true;
@@ -414,7 +413,7 @@ void VRecording::processMessage(Message* m)
         break;
       }
     }
-       if (cancel && tabbar.mouseLBDOWN((m->parameter >> 16) - getScreenX(), (m->parameter & 0xFFFF) - getScreenY()))
+       if (cancel && tabbar.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
        {
                buttons = false;
                button[selected].setActive(0);

diff --git a/vrecordinglist.cc b/vrecordinglist.cc
index cbbfe9b6e8822ba842bb04c50f30b063cc481fcc..a9b6caa98aff303bf7afe8db6a04d8b2aa1a0aa3 100644 (file)
--- a/vrecordinglist.cc
+++ b/vrecordinglist.cc
@@ -56,7 +56,7 @@ void VRecordingList::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       quickUpdate();
       boxstack->update(this);
@@ -64,7 +64,7 @@ void VRecordingList::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vrecordingmenu.cc b/vrecordingmenu.cc
index 7627ee295cff2a00846cdad172a363fc4feaffc0..06e108a20d4fb8c9b32b6fd4a9bdab0234adc41e 100644 (file)
--- a/vrecordingmenu.cc
+++ b/vrecordingmenu.cc
@@ -198,7 +198,7 @@ void VRecordingMenu::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.draw();
       BoxStack::getInstance()->update(this);
@@ -206,7 +206,7 @@ void VRecordingMenu::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vserverselect.cc b/vserverselect.cc
index 767a556278304fe38233b8721bf56b2adb3b42ac..1f4175a2f0ce1875ec00fea7f054edc155894da0 100644 (file)
--- a/vserverselect.cc
+++ b/vserverselect.cc
@@ -102,7 +102,7 @@ void VServerSelect::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.draw();
       BoxStack::getInstance()->update(this);
@@ -110,7 +110,7 @@ void VServerSelect::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vtimeredit.cc b/vtimeredit.cc
index 214cff8b7002d25d394265ec4ab4609f76245dd5..dbc8facfc7aa9107dffe0bbba2fb67698c2253a2 100644 (file)
--- a/vtimeredit.cc
+++ b/vtimeredit.cc
@@ -235,8 +235,8 @@ void VTimerEdit::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (buttonBack.mouseMove(x,y)) {
           selectedButton=0;
           buttonDelete.setActive(false);

diff --git a/vtimerlist.cc b/vtimerlist.cc
index 4b35947724979fcda254735ffe4a98fa8ce41c70..d093e046fb4705b14242576a149552d31b610763 100644 (file)
--- a/vtimerlist.cc
+++ b/vtimerlist.cc
@@ -317,15 +317,15 @@ void VTimerList::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
-       quickUpdate();
+      quickUpdate();
       BoxStack::getInstance()->update(this);
     }
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       BoxStack::getInstance()->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/vvideolivetv.cc b/vvideolivetv.cc
index 2f3bb7465d1918b7ee1a398ca7edd836c89f5868..dcaaa04aafbdc36fbef7bad9002edf7788d87c8b 100644 (file)
--- a/vvideolivetv.cc
+++ b/vvideolivetv.cc
@@ -1010,8 +1010,8 @@ void VVideoLiveTV::processMessage(Message* m)
   if (m->message == Message::MOUSE_LBDOWN)
   {
     //check if press is outside this view! then simulate cancel
-    int x = (m->parameter >> 16) - osd.getScreenX();
-    int y = (m->parameter & 0xFFFF) - osd.getScreenY();
+    int x = m->parameter - osd.getScreenX();
+    int y = m->tag - osd.getScreenY();
     if (osd.getVisible())
     {
         if ((boxRed.getX()<=x) && (boxRed.getX()+(int)boxRed.getWidth()>=x ) &&

diff --git a/vvideomedia.cc b/vvideomedia.cc
index 03d85584f416444130f3dff0e4ed73dafeeb1bf4..ca02084f9aed7c7eb4f3a8a32ca1597f50d909ca 100644 (file)
--- a/vvideomedia.cc
+++ b/vvideomedia.cc
@@ -333,8 +333,8 @@ void VVideoMedia::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_LBDOWN)
   {
-    UINT x = (m->parameter>>16) - getScreenX();
-    UINT y = (m->parameter&0xFFFF) - getScreenY();
+    UINT x = m->parameter - getScreenX();
+    UINT y = m->tag - getScreenY();
 
     if (!barShowing)
     {

diff --git a/vvideorec.cc b/vvideorec.cc
index 0be40e126e4512f382e2d60beba7b08e998b4f2b..ebc076ed1c10ba82f85b3989d122982991478552 100644 (file)
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -447,8 +447,8 @@ void VVideoRec::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_LBDOWN)
   {
-    UINT x = (m->parameter>>16) - getScreenX();
-    UINT y = (m->parameter&0xFFFF) - getScreenY();
+    UINT x = m->parameter - getScreenX();
+    UINT y = m->tag - getScreenY();
 
     if (!barShowing)
     {

diff --git a/vwelcome.cc b/vwelcome.cc
index dc3655ba9b808c297126425a8fa5286885968263..a3bace75ba7ec53df31ecc077de4762f6c88a8c7 100644 (file)
--- a/vwelcome.cc
+++ b/vwelcome.cc
@@ -395,7 +395,7 @@ void VWelcome::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.draw();
       boxstack->update(this);
@@ -403,7 +403,7 @@ void VWelcome::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       boxstack->handleCommand(Input::OK); //simulate OK press
     }

diff --git a/winmain.cc b/winmain.cc
index 17b9b4af6e947cfb263ef85c0172436cb1969443..53d24c2380238d61ec6c321572383a9e7e0d044d 100644 (file)
--- a/winmain.cc
+++ b/winmain.cc
@@ -540,26 +540,12 @@ LONG FAR PASCAL WindowProc(HWND wind, UINT msg, WPARAM wparam, LPARAM lparam)
       return DefWindowProc(wind,msg,wparam, lparam);
     }
     break;
-  case WM_MOUSEMOVE: {
-
-    lastmousemove=timeGetTime();
-    SetCursor(LoadCursor(NULL,IDC_ARROW));
-    SetTimer(wind,VOMP_CURSORUPDATE,4500,NULL);
-    POINT mpos={GET_X_LPARAM(lparam),GET_Y_LPARAM(lparam)};
-    ClientToScreen(wind,&mpos);
-    if (TranslateMousePosition(&mpos)) {
-      Message *mousemes=new Message();
-      mousemes->message=Message::MOUSE_MOVE;
-      mousemes->from=NULL;
-      mousemes->p_to = Message::MOUSE_RECEIVER;
-      mousemes->parameter=(mpos.x & 0xFFFF)<< 16| (mpos.y & 0xFFFF);
-      mousemes->tag=0;
-      messageQueue->postMessage(mousemes);
+  case WM_CONTEXTMENU:
+    if (!ContextMenu(wind,GET_X_LPARAM(lparam),GET_Y_LPARAM(lparam))) {
+      return DefWindowProc(wind, msg, wparam, lparam);
+    } else {
+      return 0;
     }
-
-    return 0;
-    //return DefWindowProc(wind,msg,wparam, lparam);
-             }
     break;
   case WM_TIMER:
     if (wparam==VOMP_CURSORUPDATE) {
@@ -567,46 +553,82 @@ LONG FAR PASCAL WindowProc(HWND wind, UINT msg, WPARAM wparam, LPARAM lparam)
       return 0;
     }
     return DefWindowProc(wind, msg, wparam, lparam);
-
     break;
-  case WM_CONTEXTMENU:
-    if (!ContextMenu(wind,GET_X_LPARAM(lparam),GET_Y_LPARAM(lparam))) {
-      return DefWindowProc(wind, msg, wparam, lparam);
-    } else {
-      return 0;
+
+    // Mouse events
+    // param = X
+    // tag = Y
+    // data = wheel delta
+
+    case WM_MOUSEMOVE:
+    {
+      lastmousemove = timeGetTime();
+      SetCursor(LoadCursor(NULL,IDC_ARROW));
+      SetTimer(wind, VOMP_CURSORUPDATE, 4500, NULL);
+      POINT mpos = { GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam) };
+      ClientToScreen(wind, &mpos);
+      if (TranslateMousePosition(&mpos))
+      {
+        Message* mousemes = new Message();
+        mousemes->message = Message::MOUSE_MOVE;
+        mousemes->from = NULL;
+        mousemes->p_to = Message::MOUSE_RECEIVER;
+        mousemes->parameter = mpos.x;
+        mousemes->tag = mpos.y;
+
+        //mousemes->parameter = (mpos.x & 0xFFFF) << 16 | (mpos.y & 0xFFFF);
+        //mousemes->tag = 0;
+        messageQueue->postMessage(mousemes);
+      }
+      //return DefWindowProc(wind,msg,wparam, lparam);
+      break;
     }
-    break;
-  case WM_LBUTTONDOWN:{
-    POINT mpos={GET_X_LPARAM(lparam),GET_Y_LPARAM(lparam)};
-    ClientToScreen(wind,&mpos);
-    if (TranslateMousePosition(&mpos)) {
-      Message *mousemes=new Message();
-      mousemes->message=Message::MOUSE_LBDOWN;
-      mousemes->from=NULL;
-      mousemes->p_to = Message::MOUSE_RECEIVER;
-      mousemes->parameter=(mpos.x & 0xFFFF)<< 16| (mpos.y & 0xFFFF);
-      mousemes->tag=0;
-      messageQueue->postMessage(mousemes);
+    case WM_LBUTTONDOWN:
+    {
+      POINT mpos = { GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam) };
+      ClientToScreen(wind, &mpos);
+      if (TranslateMousePosition(&mpos))
+      {
+        Message* mousemes = new Message();
+        mousemes->message = Message::MOUSE_LBDOWN;
+        mousemes->from = NULL;
+        mousemes->p_to = Message::MOUSE_RECEIVER;
+        mousemes->parameter = mpos.x;
+        mousemes->tag = mpos.y;
+
+        //mousemes->parameter = (mpos.x & 0xFFFF) << 16 | (mpos.y & 0xFFFF);
+        //mousemes->tag = 0;
+        messageQueue->postMessage(mousemes);
+      }
+      break;
     }
-            }break;
-  case WM_MOUSEWHEEL:{
-       POINT mpos = { GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam) };
-       ClientToScreen(wind, &mpos);
-       if (TranslateMousePosition(&mpos)) {
-               Message *mousemes = new Message();
-               mousemes->message = Message::MOUSE_SCROLL;
-               mousemes->from = NULL;
+    case WM_MOUSEWHEEL:
+    {
+      POINT mpos = { GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam) };
+      ClientToScreen(wind, &mpos);
+      if (TranslateMousePosition(&mpos))
+      {
+        Message* mousemes = new Message();
+        mousemes->message = Message::MOUSE_SCROLL;
+        mousemes->from = NULL;
         mousemes->p_to = Message::MOUSE_RECEIVER;
-               mousemes->parameter = (0 & 0xFFFF) << 16 | (GET_WHEEL_DELTA_WPARAM(wparam)  &0xFFFF);
-               mousemes->tag = (mpos.x & 0xFFFF) << 16 | (mpos.y & 0xFFFF);
-               messageQueue->postMessage(mousemes);
-       }
+        mousemes->parameter = mpos.x;
+        mousemes->tag = mpos.y;
+        mousemes->data = GET_WHEEL_DELTA_WPARAM(wparam) & 0xFFFF; // filter prob not necessary
 
-  } break;
-    default:
-        return DefWindowProc(wind, msg, wparam, lparam);
+        //mousemes->parameter = (0 & 0xFFFF) << 16 | (GET_WHEEL_DELTA_WPARAM(wparam) & 0xFFFF);
+        //mousemes->tag = (mpos.x & 0xFFFF) << 16 | (mpos.y & 0xFFFF);
+        messageQueue->postMessage(mousemes);
+      }
+      break;
     }
-    return 0L;
+
+
+    default:
+      return DefWindowProc(wind, msg, wparam, lparam);
+  }
+
+  return 0L;
 }
 
 

diff --git a/wremoteconfig.cc b/wremoteconfig.cc
index fa5a13f6558a738bfaa93a5345ddd0d214490804..d7f1e0fc8c19c3513b81e678315470c56f21e367 100644 (file)
--- a/wremoteconfig.cc
+++ b/wremoteconfig.cc
@@ -138,7 +138,7 @@ void WRemoteConfig::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.setShowSelOption(true);
       sl.draw();
@@ -147,15 +147,15 @@ void WRemoteConfig::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       ViewMan::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (x<0 || y <0 || x>getWidth() || y>getHeight())
       {
         ViewMan::getInstance()->handleCommand(Input::BACK); //simulate cancel press

diff --git a/wwinaudiofilter.cc b/wwinaudiofilter.cc
index 9e1737c7e6aba85b8d420bce3e553ca6d827cc56..f498ee1222260639bb28a89cd771d84f6a7a6b7e 100644 (file)
--- a/wwinaudiofilter.cc
+++ b/wwinaudiofilter.cc
@@ -135,7 +135,7 @@ void WWinAudioFilter::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.setShowSelOption(true);
       sl.draw();
@@ -145,15 +145,15 @@ void WWinAudioFilter::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       ViewMan::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (x<0 || y <0 || x>getWidth() || y>getHeight())
       {
         ViewMan::getInstance()->handleCommand(Input::BACK); //simulate cancel press

diff --git a/wwinmp3audiofilter.cc b/wwinmp3audiofilter.cc
index 68e70195992cc009d64df408c3b50a5c07c6839a..2cbf96449a29d786c53e144c8945e3f296432829 100644 (file)
--- a/wwinmp3audiofilter.cc
+++ b/wwinmp3audiofilter.cc
@@ -143,7 +143,7 @@ void WWinMp3AudioFilter::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.setShowSelOption(true);
       sl.draw();
@@ -153,15 +153,15 @@ void WWinMp3AudioFilter::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       ViewMan::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (x<0 || y <0 || x>getWidth() || y>getHeight())
       {
         ViewMan::getInstance()->handleCommand(Input::BACK); //simulate cancel press

diff --git a/wwinvideofilter.cc b/wwinvideofilter.cc
index 8dd34e6cc2b54e905439f0d53625f557c14000f0..95d22199e6dff7fb1849c1f7a4d6b4d8eb9810f5 100644 (file)
--- a/wwinvideofilter.cc
+++ b/wwinvideofilter.cc
@@ -135,7 +135,7 @@ void WWinVideoFilter::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.setShowSelOption(true);
       sl.draw();
@@ -145,15 +145,15 @@ void WWinVideoFilter::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       ViewMan::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (x<0 || y <0 || x>getWidth() || y>getHeight())
       {
         ViewMan::getInstance()->handleCommand(Input::BACK); //simulate cancel press

diff --git a/wwinvideoh264filter.cc b/wwinvideoh264filter.cc
index b82ccace17461bb7e335a037d3795117388b22d8..8e71e1505691ac54609de2004276b78e09182012 100644 (file)
--- a/wwinvideoh264filter.cc
+++ b/wwinvideoh264filter.cc
@@ -135,7 +135,7 @@ void WWinVideoH264Filter::processMessage(Message* m)
 
   if (m->message == Message::MOUSE_MOVE)
   {
-    if (sl.mouseMove((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseMove(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       sl.setShowSelOption(true);
       sl.draw();
@@ -145,15 +145,15 @@ void WWinVideoH264Filter::processMessage(Message* m)
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
-    if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
+    if (sl.mouseLBDOWN(m->parameter - getScreenX(), m->tag - getScreenY()))
     {
       ViewMan::getInstance()->handleCommand(Input::OK); //simulate OK press
     }
     else
     {
       //check if press is outside this view! then simulate cancel
-      int x=(m->parameter>>16)-getScreenX();
-      int y=(m->parameter&0xFFFF)-getScreenY();
+      int x = m->parameter - getScreenX();
+      int y = m->tag - getScreenY();
       if (x<0 || y <0 || x>getWidth() || y>getHeight())
       {
         ViewMan::getInstance()->handleCommand(Input::BACK); //simulate cancel press