openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix duplicate function definitions

Browse Source
This commit is contained in:
Celtic Minstrel
2022-03-13 10:47:12 -04:00
parent b364cc9bdb
commit af8f30aaf2
2 changed files with 5 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dialogxml/keycodes.hpp
View File

@@ -86,4 +86,9 @@ bool operator== (cKey a, cKey b);
/// @return true if the needle is in the haystack
bool mod_contains(eKeyMod haystack, eKeyMod needle);
/// Applies the shift key to the given character (assumes US keyboard layout)
unsigned char applyShift(unsigned char c);
/// Removes the shift key from the given character (assumes US keyboard layout)
unsigned char removeShift(unsigned char c);
#endif

98
src/dialogxml/widgets/control.cpp
View File

@@ -110,80 +110,6 @@ const char* xUnsupportedProp::what() const throw(){
return msg;
}
eKeyMod operator + (eKeyMod lhs, eKeyMod rhs){
if(lhs == rhs) return lhs;
else if(lhs == mod_none) return rhs;
else if(lhs == mod_alt){
if(rhs == mod_shift || rhs == mod_altshift) return mod_altshift;
else if(rhs == mod_ctrl || rhs == mod_altctrl) return mod_altctrl;
else if(rhs == mod_shiftctrl || rhs == mod_all) return mod_all;
else return mod_alt;
}else if(lhs == mod_shift){
if(rhs == mod_alt || rhs == mod_altshift) return mod_altshift;
else if(rhs == mod_ctrl || rhs == mod_shiftctrl) return mod_shiftctrl;
else if(rhs == mod_altctrl || rhs == mod_all) return mod_all;
else return mod_shift;
}else if(lhs == mod_ctrl){
if(rhs == mod_alt || rhs == mod_altctrl) return mod_altctrl;
else if(rhs == mod_shift || rhs == mod_shiftctrl) return mod_shiftctrl;
else if(rhs == mod_altshift || rhs == mod_all) return mod_all;
else return mod_ctrl;
}else return rhs + lhs;
}
eKeyMod operator - (eKeyMod lhs, eKeyMod rhs){
if(lhs == rhs || lhs == mod_none || rhs == mod_all) return mod_none;
else if(rhs == mod_none) return lhs;
else if(lhs == mod_all){
if(rhs == mod_alt) return mod_shiftctrl;
else if(rhs == mod_shift) return mod_altctrl;
else if(rhs == mod_ctrl) return mod_altshift;
else if(rhs == mod_altshift) return mod_ctrl;
else if(rhs == mod_altctrl) return mod_shift;
else if(rhs == mod_shiftctrl) return mod_alt;
else return mod_all;
}else if(lhs == mod_shiftctrl){
if(rhs == mod_shift || rhs == mod_altshift) return mod_ctrl;
else if(rhs == mod_ctrl || rhs == mod_altctrl) return mod_shift;
else return mod_shiftctrl;
}else if(lhs == mod_altctrl){
if(rhs == mod_alt || rhs == mod_altshift) return mod_ctrl;
else if(rhs == mod_ctrl || rhs == mod_shiftctrl) return mod_alt;
else return mod_altctrl;
}else if(lhs == mod_altshift){
if(rhs == mod_alt || rhs == mod_altctrl) return mod_shift;
else if(rhs == mod_shift || rhs == mod_shiftctrl) return mod_alt;
else return mod_altshift;
}else if(lhs == mod_alt && (rhs == mod_altshift || rhs == mod_altctrl))
return mod_none;
else if(lhs == mod_shift && (rhs == mod_altshift || rhs == mod_shiftctrl))
return mod_none;
else if(lhs == mod_ctrl && (rhs == mod_altctrl || rhs == mod_shiftctrl))
return mod_none;
else return lhs;
}
eKeyMod& operator += (eKeyMod&lhs, eKeyMod rhs){
lhs = lhs + rhs;
return lhs;
}
eKeyMod& operator -= (eKeyMod&lhs, eKeyMod rhs){
lhs = lhs - rhs;
return lhs;
}
bool operator== (cKey a, cKey b){
if(a.spec != b.spec) return false;
if(a.mod != b.mod) return false;
return a.spec ? a.k == b.k : (a.c == 0 ? false : a.c == b.c);
}
bool mod_contains(eKeyMod mods, eKeyMod mod) {
if((mods & mod) != 0) return true;
return false;
}
void cControl::show(){
visible = true;
if(labelCtrl) labelCtrl->show();
@@ -312,30 +238,6 @@ bool cControl::handleClick(location){
return clicked;
}
static unsigned char applyShift(unsigned char c){
static const char afterShift[] = {
' ', '!', '"', '#', '$', '%', '&', '"', '(', ')', '*', '+', '<', '_', '>', '?',
')', '!', '@', '#', '$', '%', '^', '&', '*', '(', ':', ':', '<', '+', '>', '?',
'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '^', '_',
'~', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~',
};
return afterShift[c - ' '];
}
static unsigned char removeShift(unsigned char c){
static const char afterUnShift[] = {
' ', '1', '\'','3', '4', '5', '7', '\'','9', '0', '8', '=', ',', '-', '.', '/',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ';', ';', ',', '=', '.', '/',
'2', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '[', '\\',']', '6', '-',
'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '[', '\\',']', '`',
};
return afterUnShift[c - ' '];
}
std::string cControl::getAttachedKeyDescription() {
std::string s;
if(key.spec) {