Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only add libglut.so on x86

Browse Source 
added keymap symlinks Finnish, Brazilian, Croatian
Keymap preferences app wasn't able to load symlinked keymaps


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21756 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2007-07-30 18:43:32 +00:00
parent ff8e5cd851
commit 3c25084c0e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/jam/HaikuImage
View File

@ -174,7 +174,9 @@ AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnet.so ;
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ; AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ;
AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ; AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ;
# libGL.so have GLUT built-in # libGL.so have GLUT built-in
if $(TARGET_ARCH) = x86 {
AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ; AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
}
# servers # servers
AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ; AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ;
@ -306,6 +308,9 @@ local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
: *.keymap ] ; : *.keymap ] ;
keymapFiles = $(keymapFiles:BG=keymap) ; keymapFiles = $(keymapFiles:BG=keymap) ;
AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ; AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ;
AddSymlinkToHaikuImage beos etc Keymap : Swedish : Finnish ;
AddSymlinkToHaikuImage beos etc Keymap : Slovene : Croatian ;
AddSymlinkToHaikuImage beos etc Keymap : US-International : Brazilian ;
local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ; local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
for timezone in $(timezones) { for timezone in $(timezones) {

25
src/preferences/keymap/Keymap.cpp
View File

@ -86,21 +86,28 @@ status_t
Keymap::Load(entry_ref &ref) Keymap::Load(entry_ref &ref)
{ {
status_t err; status_t err;
BEntry entry(&ref, true);
BFile file(&ref, B_READ_ONLY); if ((err = entry.InitCheck()) != B_OK) {
if ((err = file.InitCheck()) != B_OK) { fprintf(stderr, "error loading keymap: %s\n", strerror(err));
printf("error %s\n", strerror(err));
return err; return err;
} }
if (file.Read(&fKeys, sizeof(fKeys)) < (ssize_t)sizeof(fKeys)) { BFile file(&entry, B_READ_ONLY);
if ((err = file.InitCheck()) != B_OK) {
fprintf(stderr, "error loading keymap: %s\n", strerror(err));
return err;
}
if ((err = file.Read(&fKeys, sizeof(fKeys))) < (ssize_t)sizeof(fKeys)) {
fprintf(stderr, "error reading keymap keys: %s\n", strerror(err));
return B_BAD_VALUE; return B_BAD_VALUE;
} }
for (uint32 i=0; i<sizeof(fKeys)/4; i++) for (uint32 i=0; i<sizeof(fKeys)/4; i++)
((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]); ((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]);
if (file.Read(&fCharsSize, sizeof(uint32)) < (ssize_t)sizeof(uint32)) { if ((err = file.Read(&fCharsSize, sizeof(uint32))) < (ssize_t)sizeof(uint32)) {
fprintf(stderr, "error reading keymap size: %s\n", strerror(err));
return B_BAD_VALUE; return B_BAD_VALUE;
} }
@ -109,8 +116,10 @@ Keymap::Load(entry_ref &ref)
delete[] fChars; delete[] fChars;
fChars = new char[fCharsSize]; fChars = new char[fCharsSize];
err = file.Read(fChars, fCharsSize); err = file.Read(fChars, fCharsSize);
if (err < B_OK) {
return B_OK; fprintf(stderr, "error reading keymap chars: %s\n", strerror(err));
}
return err;
} }