test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-05 13:48:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix input devices' hotplug detection

Browse Source
This commit is contained in:
houzh 2023-12-05 19:08:28 +08:00
parent cd2c2c2e77
commit 64f383d73d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/core/inputeventsource.cc
View File

@ -85,7 +85,7 @@ std::shared_ptr<InputDevice>InputEventSource::getdevice(int fd){
std::shared_ptr<InputDevice>dev;
auto itr = mDevices.find(fd);
if(itr == mDevices.end()){
InputDevice tmpdev(fd);LOGI("device %d classes=%x",fd,tmpdev.getClasses());
InputDevice tmpdev(fd);
if(tmpdev.getClasses()&(INPUT_DEVICE_CLASS_TOUCH|INPUT_DEVICE_CLASS_TOUCH_MT)){
dev.reset(new MouseDevice(fd));
dev->setEventConsumeListener([&](const InputEvent&e){

5
src/porting/common/input_linux.cc
View File

@ -183,7 +183,6 @@ INT InputGetEvents(INPUTEVENT*outevents,UINT max,DWORD timeout) {
tv.tv_usec= (timeout%1000)*1000;//1000L*timeout;
tv.tv_sec = timeout/1000;
FD_ZERO(&rfds);
std::remove_if(dev.fds.begin(),dev.fds.end(),[](const DEVICENODE& nd){return nd.fd==-1;});
for(int i = 0; i < dev.fds.size(); i++) {
FD_SET(dev.fds[i].fd,&rfds);
}
@ -223,13 +222,13 @@ INT InputGetEvents(INPUTEVENT*outevents,UINT max,DWORD timeout) {
e->device = open(path.c_str(),O_RDWR);
e->type = EV_ADD;
dev.fds.push_back({e->device,path});
dev.maxfd=std::max(dev.maxfd,e->device);
dev.maxfd=std::max(dev.maxfd,e->device);
LOGI("device %s:%d created",path.c_str(),e->device);
e++;
}else{
LOGI("device %s:%d event=%x rc=%d",path.c_str(),ievent->wd,ievent->mask,IN_CREATE,IN_DELETE,rc);
}
elen+=(sizeof(struct inotify_event)+ievent->len);
elen+=(sizeof(struct inotify_event)+ievent->len);
}
}else {/*for input devices*/
rc = read(FDS[i].fd,events, sizeof(events)/sizeof(struct input_event));