projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ATSPI] Add MoveOuted interface
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
accessibility
/
bridge
/
accessible.cpp
diff --git
a/dali/internal/accessibility/bridge/accessible.cpp
b/dali/internal/accessibility/bridge/accessible.cpp
index
b1bb36e
..
95814c2
100644
(file)
--- a/
dali/internal/accessibility/bridge/accessible.cpp
+++ b/
dali/internal/accessibility/bridge/accessible.cpp
@@
-48,9
+48,9
@@
std::vector<std::string> Accessible::GetInterfaces()
{
tmp.push_back(AtspiDbusInterfaceComponent);
}
{
tmp.push_back(AtspiDbusInterfaceComponent);
}
- if(auto
d
= dynamic_cast<Action*>(this))
+ if(auto
action
= dynamic_cast<Action*>(this))
{
{
- if(
d
->GetActionCount() > 0)
+ if(
action
->GetActionCount() > 0)
{
tmp.push_back(AtspiDbusInterfaceAction);
}
{
tmp.push_back(AtspiDbusInterfaceAction);
}
@@
-68,99
+68,110
@@
Accessible::Accessible()
Accessible::~Accessible()
{
Accessible::~Accessible()
{
- auto b = bridgeData.lock();
- if(b)
- b->knownObjects.erase(this);
+ auto handle = mBridgeData.lock();
+ if(handle)
+ {
+ handle->mKnownObjects.erase(this);
+ }
}
void Accessible::EmitActiveDescendantChanged(Accessible* obj, Accessible* child)
{
}
void Accessible::EmitActiveDescendantChanged(Accessible* obj, Accessible* child)
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->b
ridge->EmitActiveDescendantChanged(obj, child);
+ b
ridgeData->mB
ridge->EmitActiveDescendantChanged(obj, child);
}
}
}
}
-void Accessible::EmitStateChanged(State state, int newValue
1, int newValue2
)
+void Accessible::EmitStateChanged(State state, int newValue
, int reserved
)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitStateChanged(this, state, newValue1, newValue2
);
+ b
ridgeData->mBridge->EmitStateChanged(this, state, newValue, reserved
);
}
}
}
}
-void Accessible::EmitShowing(bool
s
howing)
+void Accessible::EmitShowing(bool
isS
howing)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitStateChanged(this, State::SHOWING, s
howing ? 1 : 0, 0);
+ b
ridgeData->mBridge->EmitStateChanged(this, State::SHOWING, isS
howing ? 1 : 0, 0);
}
}
}
}
-void Accessible::EmitVisible(bool
v
isible)
+void Accessible::EmitVisible(bool
isV
isible)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitStateChanged(this, State::VISIBLE, v
isible ? 1 : 0, 0);
+ b
ridgeData->mBridge->EmitStateChanged(this, State::VISIBLE, isV
isible ? 1 : 0, 0);
}
}
}
}
-void Accessible::EmitHighlighted(bool
set
)
+void Accessible::EmitHighlighted(bool
isHighlighted
)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitStateChanged(this, State::HIGHLIGHTED, set
? 1 : 0, 0);
+ b
ridgeData->mBridge->EmitStateChanged(this, State::HIGHLIGHTED, isHighlighted
? 1 : 0, 0);
}
}
}
}
-void Accessible::EmitFocused(bool
set
)
+void Accessible::EmitFocused(bool
isFocused
)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitStateChanged(this, State::FOCUSED, set
? 1 : 0, 0);
+ b
ridgeData->mBridge->EmitStateChanged(this, State::FOCUSED, isFocused
? 1 : 0, 0);
}
}
void Accessible::EmitTextInserted(unsigned int position, unsigned int length, const std::string& content)
{
}
}
void Accessible::EmitTextInserted(unsigned int position, unsigned int length, const std::string& content)
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->b
ridge->EmitTextChanged(this, TextChangedState::INSERTED, position, length, content);
+ b
ridgeData->mB
ridge->EmitTextChanged(this, TextChangedState::INSERTED, position, length, content);
}
}
void Accessible::EmitTextDeleted(unsigned int position, unsigned int length, const std::string& content)
{
}
}
void Accessible::EmitTextDeleted(unsigned int position, unsigned int length, const std::string& content)
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->b
ridge->EmitTextChanged(this, TextChangedState::DELETED, position, length, content);
+ b
ridgeData->mB
ridge->EmitTextChanged(this, TextChangedState::DELETED, position, length, content);
}
}
}
}
-void Accessible::EmitTextC
aret
Moved(unsigned int cursorPosition)
+void Accessible::EmitTextC
ursor
Moved(unsigned int cursorPosition)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->EmitCaret
Moved(this, cursorPosition);
+ b
ridgeData->mBridge->EmitCursor
Moved(this, cursorPosition);
}
}
}
}
-void Accessible::Emit(WindowEvent we, unsigned int detail1)
+
+void Accessible::EmitMovedOutOfScreen(MovedOutOfScreenType type)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->bridge->Emit(this, we, detail1
);
+ b
ridgeData->mBridge->EmitMovedOutOfScreen(this, type
);
}
}
}
}
-void Accessible::Emit(ObjectPropertyChangeEvent ev)
+
+void Accessible::Emit(WindowEvent event, unsigned int detail)
{
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b->bridge->Emit(this, ev);
+ bridgeData->mBridge->Emit(this, event, detail);
+ }
+}
+void Accessible::Emit(ObjectPropertyChangeEvent event)
+{
+ if(auto bridgeData = GetBridgeData())
+ {
+ bridgeData->mBridge->Emit(this, event);
}
}
void Accessible::EmitBoundsChanged(Rect<> rect)
{
}
}
void Accessible::EmitBoundsChanged(Rect<> rect)
{
- if(auto b = GetBridgeData())
+ if(auto b
ridgeData
= GetBridgeData())
{
{
- b
->b
ridge->EmitBoundsChanged(this, rect);
+ b
ridgeData->mB
ridge->EmitBoundsChanged(this, rect);
}
}
}
}
@@
-176,37
+187,39
@@
std::vector<Accessible*> Accessible::GetChildren()
std::shared_ptr<Bridge::Data> Accessible::GetBridgeData()
{
std::shared_ptr<Bridge::Data> Accessible::GetBridgeData()
{
- auto
b = b
ridgeData.lock();
- if(!
b
)
+ auto
handle = mB
ridgeData.lock();
+ if(!
handle
)
{
{
- auto
p
= Bridge::GetCurrentBridge();
-
b = p->d
ata;
+ auto
bridge
= Bridge::GetCurrentBridge();
+
handle = bridge->mD
ata;
}
}
- return
b
;
+ return
handle
;
}
Address Accessible::GetAddress()
{
}
Address Accessible::GetAddress()
{
- auto
b = b
ridgeData.lock();
- if(!
b
)
+ auto
handle = mB
ridgeData.lock();
+ if(!
handle
)
{
{
- b = GetBridgeData();
- if(b)
- b->bridge->RegisterOnBridge(this);
+ handle = GetBridgeData();
+ if(handle)
+ {
+ handle->mBridge->RegisterOnBridge(this);
+ }
}
std::ostringstream tmp;
tmp << this;
}
std::ostringstream tmp;
tmp << this;
- return {
b ? b->b
usName : "", tmp.str()};
+ return {
handle ? handle->mB
usName : "", tmp.str()};
}
}
-void Bridge::RegisterOnBridge(Accessible* obj)
+void Bridge::RegisterOnBridge(Accessible* obj
ect
)
{
{
- assert(!obj
->bridgeData.lock() || obj->bridgeData.lock() == d
ata);
- if(!obj
->b
ridgeData.lock())
+ assert(!obj
ect->mBridgeData.lock() || object->mBridgeData.lock() == mD
ata);
+ if(!obj
ect->mB
ridgeData.lock())
{
{
- assert(
d
ata);
-
data->knownObjects.insert(obj
);
- obj
->bridgeData = d
ata;
+ assert(
mD
ata);
+
mData->mKnownObjects.insert(object
);
+ obj
ect->mBridgeData = mD
ata;
}
}
}
}
@@
-220,32
+233,37
@@
Accessible* Accessible::GetDefaultLabel()
return this;
}
return this;
}
-void Accessible::NotifyAccessibilityStateChange(Dali::Accessibility::States states, bool
do
Recursive)
+void Accessible::NotifyAccessibilityStateChange(Dali::Accessibility::States states, bool
is
Recursive)
{
{
- if(auto
b
= GetBridgeData())
+ if(auto
data
= GetBridgeData())
{
{
- auto
s
= GetStates() & states;
- for(auto i = 0u; i <
s
.size(); i++)
+ auto
currentState
= GetStates() & states;
+ for(auto i = 0u; i <
currentState
.size(); i++)
{
auto index = static_cast<Dali::Accessibility::State>(i);
{
auto index = static_cast<Dali::Accessibility::State>(i);
- if(s[index])
- b->bridge->EmitStateChanged(this, index, 1, 0);
+ if(currentState[index])
+ {
+ data->mBridge->EmitStateChanged(this, index, 1, 0);
+ }
}
}
- if(doRecursive)
+
+ if(isRecursive)
{
auto children = GetChildren();
{
auto children = GetChildren();
- for(auto c : children)
- c->NotifyAccessibilityStateChange(states, doRecursive);
+ for(auto iter : children)
+ {
+ iter->NotifyAccessibilityStateChange(states, isRecursive);
+ }
}
}
}
}
}
}
-void Accessible::FindWordSeparationsUtf8(const utf8_t* s, size_t length, const char* language, char* breaks)
+void Accessible::FindWordSeparationsUtf8(const utf8_t* s
tring
, size_t length, const char* language, char* breaks)
{
{
- set_wordbreaks_utf8(s, length, language, breaks);
+ set_wordbreaks_utf8(s
tring
, length, language, breaks);
}
}
-void Accessible::FindLineSeparationsUtf8(const utf8_t* s, size_t length, const char* language, char* breaks)
+void Accessible::FindLineSeparationsUtf8(const utf8_t* s
tring
, size_t length, const char* language, char* breaks)
{
{
- set_linebreaks_utf8(s, length, language, breaks);
+ set_linebreaks_utf8(s
tring
, length, language, breaks);
}
}