i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into package-management

Browse Source 
Conflicts:
	build/jam/HaikuImage
	src/system/kernel/arch/x86/64/arch.S
This commit is contained in:
Ingo Weinhold
2013-05-12 00:18:19 +02:00
parent 3c94ecf6b4 88cc420211
commit c663ca2171
322 changed files with 4776 additions and 2867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Menu.h
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Copyright 2007-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _MENU_H
@@ -10,6 +10,7 @@
#include <List.h>
#include <View.h>
class BMenu;
class BMenuBar;
class BMenuItem;
@@ -216,7 +217,7 @@ private:
void _ComputeColumnLayout(int32 index, bool bestFit,
bool moveItems, BRect* override, BRect& outRect);
void _ComputeRowLayout(int32 index, bool bestFit,
bool moveItems, BRect& outRect);
bool moveItems, BRect& outRect);
void _ComputeMatrixLayout(BRect& outRect);
BRect _CalcFrame(BPoint where, bool* scrollOn);
headers/os/interface/MenuField.h
+16 -14
View File
@@ -16,12 +16,14 @@ class BMenuField : public BView {
public:
BMenuField(BRect frame, const char* name,
const char* label, BMenu* menu,
uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
uint32 resizingMode = B_FOLLOW_LEFT
| B_FOLLOW_TOP,
uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
BMenuField(BRect frame, const char* name,
const char* label, BMenu* menu,
bool fixed_size,
uint32 resize = B_FOLLOW_LEFT|B_FOLLOW_TOP,
uint32 resizingMode = B_FOLLOW_LEFT
| B_FOLLOW_TOP,
uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
BMenuField(const char* name,
const char* label, BMenu* menu,
@@ -35,14 +37,14 @@ public:
virtual status_t Archive(BMessage* archive,
bool deep = true) const;
virtual void Draw(BRect update);
virtual void Draw(BRect updateRect);
virtual void AttachedToWindow();
virtual void AllAttached();
virtual void MouseDown(BPoint where);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MakeFocus(bool state);
virtual void MessageReceived(BMessage* message);
virtual void WindowActivated(bool state);
virtual void MessageReceived(BMessage* message);
virtual void WindowActivated(bool state);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage);
@@ -58,24 +60,24 @@ public:
virtual void SetLabel(const char* label);
const char* Label() const;
virtual void SetEnabled(bool on);
virtual void SetEnabled(bool on);
bool IsEnabled() const;
virtual void SetAlignment(alignment label);
alignment Alignment() const;
virtual void SetDivider(float dividing_line);
virtual void SetDivider(float position);
float Divider() const;
void ShowPopUpMarker();
void HidePopUpMarker();
virtual BHandler* ResolveSpecifier(BMessage* message,
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 form, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t GetSupportedSuites(BMessage* data);
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* width, float* height);
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* width, float* height);
virtual BSize MinSize();
virtual BSize MaxSize();
@@ -87,8 +89,8 @@ public:
virtual status_t Perform(perform_code d, void* arg);
protected:
virtual status_t AllArchived(BMessage* into) const;
virtual status_t AllUnarchived(const BMessage* from);
virtual status_t AllArchived(BMessage* into) const;
virtual status_t AllUnarchived(const BMessage* from);
virtual void LayoutInvalidated(bool descendants);
virtual void DoLayout();
@@ -121,7 +123,7 @@ private:
void InitObject(const char* label);
void InitObject2();
void DrawLabel(BRect bounds, BRect update);
void DrawLabel(BRect updateRect);
static void InitMenu(BMenu* menu);
int32 _MenuTask();
headers/os/support/SupportDefs.h
+1
View File
@@ -137,6 +137,7 @@ typedef generic_addr_t generic_size_t;
/* off_t */
#define B_PRIdOFF B_PRId64
#define B_PRIiOFF B_PRIi64
#define B_PRIxOFF B_PRIx64
/* dev_t */
#define B_PRIdDEV B_PRId32
#define B_PRIiDEV B_PRIi32
headers/private/graphics/intel_extreme/AreaKeeper.h
+3 -3
View File
@@ -22,7 +22,7 @@ class AreaKeeper {
area_id Create(const char *name, void **_virtualAddress, uint32 spec,
size_t size, uint32 lock, uint32 protection);
area_id Map(const char *name, void *physicalAddress, size_t numBytes,
area_id Map(const char *name, addr_t physicalAddress, size_t numBytes,
uint32 spec, uint32 protection, void **_virtualAddress);
status_t InitCheck() { return fArea < B_OK ? (status_t)fArea : B_OK; }
@@ -57,10 +57,10 @@ AreaKeeper::Create(const char *name, void **_virtualAddress, uint32 spec,
area_id
AreaKeeper::Map(const char *name, void *physicalAddress, size_t numBytes,
AreaKeeper::Map(const char *name, addr_t physicalAddress, size_t numBytes,
uint32 spec, uint32 protection, void **_virtualAddress)
{
fArea = map_physical_memory(name, (addr_t)physicalAddress, numBytes, spec,
fArea = map_physical_memory(name, physicalAddress, numBytes, spec,
protection, _virtualAddress);
return fArea;
}
headers/private/graphics/intel_extreme/intel_extreme.h
+2 -2
View File
@@ -226,13 +226,13 @@ struct intel_allocate_graphics_memory {
uint32 size;
uint32 alignment;
uint32 flags;
uint32 buffer_base;
addr_t buffer_base;
};
// free graphics memory
struct intel_free_graphics_memory {
uint32 magic;
uint32 buffer_base;
addr_t buffer_base;
};
//----------------------------------------------------------
headers/private/graphics/radeon_hd/AreaKeeper.h
+3 -3
View File
@@ -22,7 +22,7 @@ class AreaKeeper {
area_id Create(const char *name, void **_virtualAddress, uint32 spec,
size_t size, uint32 lock, uint32 protection);
area_id Map(const char *name, void *physicalAddress, size_t numBytes,
area_id Map(const char *name, addr_t physicalAddress, size_t numBytes,
uint32 spec, uint32 protection, void **_virtualAddress);
status_t InitCheck() { return fArea < B_OK ? (status_t)fArea : B_OK; }
@@ -57,10 +57,10 @@ AreaKeeper::Create(const char *name, void **_virtualAddress, uint32 spec,
area_id
AreaKeeper::Map(const char *name, void *physicalAddress, size_t numBytes,
AreaKeeper::Map(const char *name, addr_t physicalAddress, size_t numBytes,
uint32 spec, uint32 protection, void **_virtualAddress)
{
fArea = map_physical_memory(name, (addr_t)physicalAddress, numBytes, spec,
fArea = map_physical_memory(name, physicalAddress, numBytes, spec,
protection, _virtualAddress);
return fArea;
}
headers/private/interface/BMCPrivate.h
+7 -7
View File
@@ -1,10 +1,11 @@
/*
* Copyright 2001-2009 Haiku, Inc. All rights reserved.
* Copyright 2001-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Marc Flerackers ([email protected])
* Stephan Aßmus <[email protected]>
* Stephan Aßmus, [email protected]
* Marc Flerackers, [email protected]
* John Scipione, [email protected]
*/
#ifndef _BMC_PRIVATE_H
#define _BMC_PRIVATE_H
@@ -12,9 +13,9 @@
#include <BeBuild.h>
#include <MenuBar.h>
#include <MenuItem.h>
#include <MessageFilter.h>
class BMessageRunner;
@@ -36,8 +37,7 @@ class _BMCMenuBar_ : public BMenuBar {
public:
_BMCMenuBar_(BRect frame, bool fixedSize,
BMenuField* menuField);
_BMCMenuBar_(bool fixedSize,
BMenuField* menuField);
_BMCMenuBar_(BMenuField* menuField);
_BMCMenuBar_(BMessage* data);
virtual ~_BMCMenuBar_();
@@ -54,7 +54,7 @@ public:
bool IsPopUpMarkerShown() const
{ return fShowPopUpMarker; }
virtual BSize MinSize();
virtual BSize MinSize();
virtual BSize MaxSize();
private:
headers/private/interface/ColumnTypes.h
+4 -3
View File
@@ -60,10 +60,11 @@ class BStringField : public BField
void SetString (const char* string);
const char* String () const;
void SetClippedString (const char* string);
bool HasClippedString () const;
const char* ClippedString ();
void SetWidth (float);
float Width ();
private:
float fWidth;
BString fString;
@@ -109,7 +110,7 @@ class BDateField : public BField
time_t Seconds ();
time_t UnixTime ();
private:
private:
struct tm fTime;
time_t fUnixTime;
time_t fSeconds;
@@ -235,7 +236,7 @@ class BBitmapColumn : public BTitledColumn
virtual int CompareFields (BField* field1, BField* field2);
virtual bool AcceptsField (const BField* field) const;
};
//=====================================================================
// Column to display BIntegerField objects as a graph.
headers/private/shared/AboutWindow.h
+3
View File
@@ -37,6 +37,9 @@ class BAboutWindow : public BWindow {
void AddVersionHistory(const char** history);
void AddExtraInfo(const char* extraInfo);
void AddText(const char* header,
const char** contents = NULL);
BBitmap* Icon();
void SetIcon(BBitmap* icon);