|
@@ -1568,7 +1568,7 @@ laInputMappingEntry* laNewInputMappingEntry(laInputMapping* im, int DeviceType,
|
|
|
}
|
|
|
laInputMappingEntry* laNewInputMappingEntryP(laInputMapping* im, int DeviceType, int JoystickDevice, char* Key, int SpecialKeyBit, int Signal){
|
|
|
laCustomSignal* cs; if(!(cs=laFindSignalByID(Signal))) return 0;
|
|
|
- laNewInputMappingEntry(im,DeviceAdded,JoystickDevice,Key,SpecialKeyBit,SSTR(cs->Name));
|
|
|
+ laNewInputMappingEntry(im,DeviceType,JoystickDevice,Key,SpecialKeyBit,SSTR(cs->Name));
|
|
|
}
|
|
|
void laRemoveInputMappingEntry(laInputMapping* im, laInputMappingEntry* e){
|
|
|
memAssignRef(e,&e->Parent,0); lstRemoveItem(&im->Entries,e); strSafeDestroy(&e->Signal); strSafeDestroy(&e->Key); memFree(e);
|
|
@@ -1840,13 +1840,44 @@ int la_TranslateSpecialKey(int keysym){
|
|
|
case VK_CONTROL: return LA_KEY_CTRL;
|
|
|
case VK_SHIFT: return LA_KEY_SHIFT;
|
|
|
case VK_MENU: return LA_KEY_ALT;
|
|
|
+ case VK_F1: return LA_KEY_F1;
|
|
|
+ case VK_F2: return LA_KEY_F2;
|
|
|
+ case VK_F3: return LA_KEY_F3;
|
|
|
+ case VK_F4: return LA_KEY_F4;
|
|
|
+ case VK_F5: return LA_KEY_F5;
|
|
|
+ case VK_F6: return LA_KEY_F6;
|
|
|
+ case VK_F7: return LA_KEY_F7;
|
|
|
+ case VK_F8: return LA_KEY_F8;
|
|
|
+ case VK_F9: return LA_KEY_F9;
|
|
|
+ case VK_F10: return LA_KEY_F10;
|
|
|
+ case VK_F11: return LA_KEY_F11;
|
|
|
+ case VK_F12: return LA_KEY_F12;
|
|
|
+ case VK_NUMPAD0: return LA_KEY_NUM0;
|
|
|
+ case VK_NUMPAD1: return LA_KEY_NUM1;
|
|
|
+ case VK_NUMPAD2: return LA_KEY_NUM2;
|
|
|
+ case VK_NUMPAD3: return LA_KEY_NUM3;
|
|
|
+ case VK_NUMPAD4: return LA_KEY_NUM4;
|
|
|
+ case VK_NUMPAD5: return LA_KEY_NUM5;
|
|
|
+ case VK_NUMPAD6: return LA_KEY_NUM6;
|
|
|
+ case VK_NUMPAD7: return LA_KEY_NUM7;
|
|
|
+ case VK_NUMPAD8: return LA_KEY_NUM8;
|
|
|
+ case VK_NUMPAD9: return LA_KEY_NUM9;
|
|
|
+ case VK_MULTIPLY: return LA_KEY_NUMMULT;
|
|
|
+ case VK_DIVIDE: return LA_KEY_NUMDIVIDE;
|
|
|
+ case VK_ADD: return LA_KEY_NUMPLUS;
|
|
|
+ case VK_SUBTRACT: return LA_KEY_NUMMINUS;
|
|
|
+ case VK_DECIMAL: return LA_KEY_NUMDOT;
|
|
|
case VK_OEM_1: return ';';
|
|
|
case VK_OEM_2: return '/';
|
|
|
case VK_OEM_3: return '`';
|
|
|
case VK_OEM_4: return '[';
|
|
|
case VK_OEM_5: return '\\';
|
|
|
case VK_OEM_6: return ']';
|
|
|
- case VK_OEM_7: return '\'';
|
|
|
+ case VK_OEM_7: return '\'';
|
|
|
+ case VK_OEM_COMMA: return ',';
|
|
|
+ case VK_OEM_PERIOD: return '.';
|
|
|
+ case VK_OEM_PLUS: return '+';
|
|
|
+ case VK_OEM_MINUS: return '-';
|
|
|
default: return keysym;
|
|
|
}
|
|
|
#endif
|
|
@@ -4397,7 +4428,7 @@ laUiItem *laShowItemFull(laUiList *uil, laColumn *c, laPropPack *Base, const cha
|
|
|
return ui;
|
|
|
}
|
|
|
laUiItem *laShowImage(laUiList *uil, laColumn *c, tnsImage* Image, int Height){
|
|
|
- laUiItem *ui = memAcquireSimple(sizeof(laUiItem));
|
|
|
+ laUiItem *ui = memAcquire(sizeof(laUiItem));
|
|
|
ui->C = c; memAssignRef(ui,&ui->Extra,Image);
|
|
|
ui->Type=_LA_UI_IMAGE; ui->Type->Init(ui);
|
|
|
ui->SymbolID=Height;
|