- Timestamp:
- Jun 24, 2022 8:39:25 PM (3 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
r95368 r95369 1195 1195 1196 1196 LONG xShift = 0, yShift = 0; 1197 if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen) 1197 1198 #ifdef VBOX_IS_QT6_OR_LATER 1199 bool fTouchScreen = (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen); 1200 #else 1201 bool fTouchScreen = (pTouchEvent->device()->type() == QTouchDevice::TouchScreen); 1202 #endif 1203 1204 if (fTouchScreen) 1198 1205 { 1199 1206 ULONG dummy; … … 1214 1221 case Qt::TouchPointStationary: 1215 1222 iTouchPointState = KTouchContactState_InContact; 1216 if ( pTouchEvent->device()->type() == QTouchDevice::TouchScreen)1223 if (fTouchScreen) 1217 1224 iTouchPointState |= KTouchContactState_InRange; 1218 1225 break; … … 1221 1228 } 1222 1229 1223 if ( pTouchEvent->device()->type() == QTouchDevice::TouchScreen)1230 if (fTouchScreen) 1224 1231 { 1225 1232 /* Get absolute touch-point origin: */ … … 1256 1263 mouse().PutEventMultiTouch(pTouchEvent->touchPoints().size(), 1257 1264 contacts, 1258 pTouchEvent->device()->type() == QTouchDevice::TouchScreen,1265 fTouchScreen, 1259 1266 (ULONG)RTTimeMilliTS()); 1260 1267 -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r95364 r95369 2261 2261 if ( aPointingHID == PointingHIDType_USBMouse 2262 2262 || aPointingHID == PointingHIDType_USBTablet 2263 || aPointingHID == PointingHIDType_USBMultiTouch) 2263 || aPointingHID == PointingHIDType_USBMultiTouch 2264 || aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad) 2264 2265 { 2265 2266 InsertConfigNode(pUsbDevices, "HidMouse", &pDev); … … 2279 2280 InsertConfigString(pLunL1, "Driver", "MainMouse"); 2280 2281 } 2281 if (aPointingHID == PointingHIDType_USBMultiTouch) 2282 if ( aPointingHID == PointingHIDType_USBMultiTouch 2283 || aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad) 2282 2284 { 2283 2285 InsertConfigNode(pDev, "1", &pInst); … … 2285 2287 2286 2288 InsertConfigString(pCfg, "Mode", "multitouch"); 2289 InsertConfigNode(pInst, "LUN#0", &pLunL0); 2290 InsertConfigString(pLunL0, "Driver", "MouseQueue"); 2291 InsertConfigNode(pLunL0, "Config", &pCfg); 2292 InsertConfigInteger(pCfg, "QueueSize", 128); 2293 2294 InsertConfigNode(pLunL0, "AttachedDriver", &pLunL1); 2295 InsertConfigString(pLunL1, "Driver", "MainMouse"); 2296 } 2297 if (aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad) 2298 { 2299 InsertConfigNode(pDev, "2", &pInst); 2300 InsertConfigNode(pInst, "Config", &pCfg); 2301 2302 InsertConfigString(pCfg, "Mode", "touchpad"); 2287 2303 InsertConfigNode(pInst, "LUN#0", &pLunL0); 2288 2304 InsertConfigString(pLunL0, "Driver", "MouseQueue"); -
trunk/src/VBox/Main/src-client/MouseImpl.cpp
r95368 r95369 1192 1192 1193 1193 1194 /** Can we currently send absolute eventsto the guest? */1194 /** Can we currently send multi-touch events (touchscreen variant) to the guest? */ 1195 1195 bool Mouse::i_supportsTS(void) 1196 1196 { … … 1199 1199 i_getDeviceCaps(NULL, NULL, &fTSDev, NULL); 1200 1200 return fTSDev; 1201 } 1202 1203 1204 /** Can we currently send multi-touch events (touchpad variant) to the guest? */ 1205 bool Mouse::i_supportsTP(void) 1206 { 1207 bool fTPDev; 1208 1209 i_getDeviceCaps(NULL, NULL, NULL, &fTPDev); 1210 return fTPDev; 1201 1211 } 1202 1212
Note:
See TracChangeset
for help on using the changeset viewer.