Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support monitoring only some events in wxGTK wxFileSystemWatcher.

Browse Source 
Call inotify() with the appropriate flags instead of always using IN_ALL_EVENTS.

Closes #14832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-15 22:24:22 +00:00
parent a386b9c614
commit b77bb705dd
3 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/unix/fswatcher_inotify.cpp
View File

@@ -479,10 +479,31 @@ protected:
return path;
}
static int Watcher2NativeFlags(int WXUNUSED(flags))
static int Watcher2NativeFlags(int flags)
{
// TODO: it would be nice to subscribe only to the events we really need
return IN_ALL_EVENTS;
// Start with the standard case of wanting all events
if (flags == wxFSW_EVENT_ALL)
{
return IN_ALL_EVENTS;
}
static const int flag_mapping[][2] = {
{ wxFSW_EVENT_ACCESS, IN_ACCESS },
{ wxFSW_EVENT_MODIFY, IN_MODIFY },
{ wxFSW_EVENT_RENAME, IN_MOVE },
{ wxFSW_EVENT_CREATE, IN_CREATE },
{ wxFSW_EVENT_DELETE, IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF }
// wxFSW_EVENT_ERROR/WARNING make no sense here
};
int native_flags = 0;
for ( unsigned int i=0; i < WXSIZEOF(flag_mapping); ++i)
{
if (flags & flag_mapping[i][0])
native_flags |= flag_mapping[i][1];
}
return native_flags;
}
static int Native2WatcherFlags(int flags)
@@ -504,7 +525,7 @@ protected:
{ IN_UNMOUNT, wxFSW_EVENT_ERROR },
{ IN_Q_OVERFLOW, wxFSW_EVENT_WARNING},
// ignored, because this is genereted mainly by watcher::Remove()
// ignored, because this is generated mainly by watcher::Remove()
{ IN_IGNORED, 0 }
};