Merged r36745-r36746, r36752-r36754, r36757, r36759 from trunk into branch.

git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha2@36763 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-05-08 22:54:50 +00:00
parent 1b1c4a7d25
commit 35bd1f0f84
7 changed files with 55 additions and 61 deletions

View File

@ -39,7 +39,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# GetText - a framework to help produce multi-lingual messages.
# Git - the distributed version control system
# ICU-devel - the headers for ICU (for development)
# KeymapSwitcher - Desktop utility
# KeymapSwitcher - Easy to use keymap switcher
# LibEvent - An event notification library
# LibIconv - text encoding conversion library
# LibLayout - GCC2 package needed by some BeOS apps to compile
@ -68,7 +68,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# TrackerNewTemplates - template files for Tracker's New menu
# Transmission - A fast, easy, and free BitTorrent Client
# UserlandFS - aids native file system development (like FUSE)
# Vim - the command line text editor
# Vim - Vi IMproved. Highly configurable text editor
# Vision - powerful native IRC client
# VLC - the multi media player with native interface
# WebPositive - native, WebKit-based web browser
@ -221,8 +221,8 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
Echo "No optional package BePDF available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-02b.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-02b.zip
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: apps
;
AddSymlinkToHaikuImage home config be Applications
@ -731,16 +731,16 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
: $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip
KeymapSwitcher-1.2.5-r1a2-x86-gcc4-2010-05-08.zip
: $(baseURL)/KeymapSwitcher-1.2.5-r1a2-x86-gcc4-2010-05-08.zip
:
;
AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ;
} else {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip
: $(baseURL)/KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip
KeymapSwitcher-1.2.5-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/KeymapSwitcher-1.2.5-r1a2-x86-gcc2-2010-05-08.zip
:
;
AddSymlinkToHaikuImage home config be Desktop\ applets
@ -1052,7 +1052,7 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
InstallOptionalHaikuImagePackage
p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
: $(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
:
@ -1329,29 +1329,23 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Vim available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31.zip
: $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip
InstallOptionalHaikuImagePackage vim-7.2-r1a2-x86-gcc4-2010-05-07.zip
: $(baseURL)/vim-7.2-r1a2-x86-gcc4-2010-05-07.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/common/bin/gvim ;
# TODO: move this symlink to the archive
AddSymlinkToHaikuImage common bin : vim : vi ;
# TODO: remove vimrc from the repository and add it to the archive
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
} else {
InstallOptionalHaikuImagePackage vim-7.2-r1a1-x86-gcc2-2009-09-06.zip
: $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip
InstallOptionalHaikuImagePackage vim-7.2-r1a2-x86-gcc2-2010-05-07.zip
: $(baseURL)/vim-7.2-r1a2-x86-gcc2-2010-05-07.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/common/bin/gvim ;
# TODO: move this symlink to the archive
AddSymlinkToHaikuImage common bin : vim : vi ;
# TODO: remove vimrc from the repository and add it to the archive
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
}
}

View File

@ -1,29 +0,0 @@
" highlight matching brackets
set showmatch
" status line: show line/column and current mode
set ruler
set showmode
" required to be able to use keypad keys and map missed escape sequences
set esckeys
" be user-friendly instead of compatible
set nocompatible
" backspace shall remove anything in insert mode
set backspace=indent,eol,start
" keys in insert mode
map! <Esc>OA <Up>
map! <Esc>OB <Down>
map! <Esc>OC <Right>
map! <Esc>OD <Left>
map! <Esc>OH <Home>
map! <Esc>OF <End>
map! <Esc>[5~ <PageUp>
map! <Esc>[6~ <PageDown>
map!  <BS>
" keys in command mode
map  X

View File

@ -3,6 +3,7 @@
* Distributed under the terms of the MIT License.
*/
#include <PCI.h>
#include <PCI_x86.h>
#include "pci_msi.h"
@ -12,7 +13,17 @@ pci_arch_module_std_ops(int32 op, ...)
{
switch (op) {
case B_MODULE_INIT:
{
module_info *dummy;
status_t result = get_module(B_PCI_MODULE_NAME, &dummy);
if (result != B_OK)
return result;
return B_OK;
}
case B_MODULE_UNINIT:
put_module(B_PCI_MODULE_NAME);
return B_OK;
}

View File

@ -2447,6 +2447,12 @@ bge_can_use_msi(struct bge_softc *sc)
{
int can_use_msi = 0;
#ifdef __HAIKU__
// temporary workaround, the int disable happens in msi enable through
// setup intr in our case which undoes the re-enabling done by the driver
return 0;
#endif
switch (sc->bge_asicrev) {
case BGE_ASICREV_BCM5714_A0:
case BGE_ASICREV_BCM5714:

View File

@ -1,10 +1,11 @@
/*
* Copyright 2007-2009 Haiku Inc. All rights reserved.
* Copyright 2007-2010 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* François Revol, revol@free.fr
* Jonas Sundström, jonas@kirilla.com
* Stephan Aßmus <superstippi@gmx.de>
*/
/*
@ -118,9 +119,9 @@ UrlWrapper::RefsReceived(BMessage* msg)
args[1] = (char*)u.String();
mimetype = kURLHandlerSigBase;
mimetype += u.Proto();
err = be_roster->Launch(mimetype.String(), 1, args+1);
if (err < B_OK)
err = be_roster->Launch(kAppSig, 1, args+1);
err = be_roster->Launch(mimetype.String(), 1, args + 1);
if (err != B_OK && err != B_ALREADY_RUNNING)
err = be_roster->Launch(kAppSig, 1, args + 1);
continue;
}
}
@ -165,7 +166,8 @@ UrlWrapper::RefsReceived(BMessage* msg)
state = 4;
break;
case 4:
if ((s = line.IFindFirst("<string>")) > -1 && (e = line.IFindFirst("</string>")) > s) {
if ((s = line.IFindFirst("<string>")) > -1
&& (e = line.IFindFirst("</string>")) > s) {
state = 5;
s += 8;
line.MoveInto(url, s, e - s);
@ -185,9 +187,9 @@ UrlWrapper::RefsReceived(BMessage* msg)
args[1] = (char*)u.String();
mimetype = kURLHandlerSigBase;
mimetype += u.Proto();
err = be_roster->Launch(mimetype.String(), 1, args+1);
if (err < B_OK)
err = be_roster->Launch(kAppSig, 1, args+1);
err = be_roster->Launch(mimetype.String(), 1, args + 1);
if (err != B_OK && err != B_ALREADY_RUNNING)
err = be_roster->Launch(kAppSig, 1, args + 1);
continue;
}
}
@ -199,9 +201,9 @@ UrlWrapper::RefsReceived(BMessage* msg)
args[1] = (char*)u.String();
mimetype = kURLHandlerSigBase;
mimetype += u.Proto();
err = be_roster->Launch(mimetype.String(), 1, args+1);
if (err < B_OK)
err = be_roster->Launch(kAppSig, 1, args+1);
err = be_roster->Launch(mimetype.String(), 1, args + 1);
if (err != B_OK && err != B_ALREADY_RUNNING)
err = be_roster->Launch(kAppSig, 1, args + 1);
continue;
}
}

View File

@ -1549,6 +1549,9 @@ BMenu::_Hide()
}
// #pragma mark - mouse tracking
const static bigtime_t kOpenSubmenuDelay = 225000;
const static bigtime_t kNavigationAreaTimeout = 1000000;
const static bigtime_t kHysteresis = 200000;
@ -1800,7 +1803,8 @@ BMenu::_UpdateStateOpenSelect(BMenuItem* item, BPoint position,
bool inNavAreaRectAbove = navAreaRectAbove.Contains(position);
bool inNavAreaRectBelow = navAreaRectBelow.Contains(position);
if (!inNavAreaRectAbove && !inNavAreaRectBelow) {
if (fSelected == NULL
|| (!inNavAreaRectAbove && !inNavAreaRectBelow)) {
_SelectItem(item, false);
navAreaRectAbove = BRect();
navAreaRectBelow = BRect();
@ -1911,6 +1915,9 @@ BMenu::_UpdateStateClose(BMenuItem* item, const BPoint& where,
}
// #pragma mark -
bool
BMenu::_AddItem(BMenuItem* item, int32 index)
{

View File

@ -365,7 +365,10 @@ BMenuItem::GetContentSize(float *width, float *height)
// BFont::Height() caches the value locally
MenuPrivate(fSuper).CacheFontInfo();
fCachedWidth = fSuper->StringWidth(fLabel);
if (fSubmenu && fSubmenu->IsLabelFromMarked())
fSubmenu->GetPreferredSize(&fCachedWidth, NULL);
else
fCachedWidth = fSuper->StringWidth(fLabel);
if (width)
*width = (float)ceil(fCachedWidth);