added a systemkeymap generation based on US-International keymap, it is hardcoded in the Jamfile for now
fix a bug in MouseSettings git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8749 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,30 @@
|
||||
SubDir OBOS_TOP src servers input ;
|
||||
|
||||
rule MkKeymapHeader
|
||||
{
|
||||
local binary = $(1) ;
|
||||
local source = $(2) ;
|
||||
|
||||
SetupObjectsDir ;
|
||||
|
||||
SEARCH on $(source) = $(SEARCH_SOURCE) ;
|
||||
MakeLocate $(binary) : $(LOCATE_TARGET) ;
|
||||
|
||||
Depends $(binary) : $(source) keymap ;
|
||||
MkKeymapHeader1 $(binary) : keymap $(source) ;
|
||||
LocalClean clean : $(binary) ;
|
||||
}
|
||||
|
||||
actions MkKeymapHeader1
|
||||
{
|
||||
$(2[1]) -o "$(1)" -h "$(2[2-])" ;
|
||||
}
|
||||
|
||||
MkKeymapHeader [ FGristFiles SystemKeymap.cpp ] : US-International.keymap ;
|
||||
|
||||
SEARCH on US-International.keymap
|
||||
+= [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) apps bin keymap ] ;
|
||||
|
||||
if $(COMPILE_FOR_R5) {
|
||||
SubDirC++Flags -DCOMPILE_FOR_R5 ;
|
||||
}
|
||||
@@ -22,6 +47,8 @@ Server input_server :
|
||||
MouseSettings.cpp
|
||||
KeyboardSettings.cpp
|
||||
|
||||
SystemKeymap.cpp
|
||||
|
||||
# storage
|
||||
AddOnMonitor.cpp
|
||||
AddOnMonitorHandler.cpp
|
||||
|
||||
@@ -120,7 +120,7 @@ MouseSettings::SaveSettings()
|
||||
file.Write(&fSettings.accel, sizeof(fSettings.accel));
|
||||
file.Write(&fSettings.click_speed, sizeof(fSettings.click_speed));
|
||||
#else
|
||||
file.Write(fSettings, sizeof(fSettings));
|
||||
file.Write(&fSettings, sizeof(fSettings));
|
||||
#endif
|
||||
|
||||
// who is responsible for saving the mouse mode?
|
||||
|
||||
Reference in New Issue
Block a user