Skip to content

Commit

Permalink
Style fixes to the Game Kit, focus on docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@jscipione
jscipione committed Jun 11, 2014
1 parent ac9714d commit 37fedaf
Show file tree
Hide file tree
Showing 6 changed files with 207 additions and 220 deletions.
142 changes: 71 additions & 71 deletions headers/os/game/DirectWindow.h
View file
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2008, Haiku.
* Copyright 2001-2008 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
Expand Down Expand Up @@ -54,106 +54,106 @@ typedef struct {


class BDirectWindow : public BWindow {
public:
BDirectWindow(BRect frame, const char *title,
public:
BDirectWindow(BRect frame, const char* title,
window_type type, uint32 flags,
uint32 workspace = B_CURRENT_WORKSPACE);
BDirectWindow(BRect frame, const char *title,
BDirectWindow(BRect frame, const char* title,
window_look look, window_feel feel,
uint32 flags,
uint32 workspace = B_CURRENT_WORKSPACE);
virtual ~BDirectWindow();
virtual ~BDirectWindow();

static BArchivable* Instantiate(BMessage *data);
virtual status_t Archive(BMessage *data,
static BArchivable* Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data,
bool deep = true) const;

virtual void Quit();
virtual void DispatchMessage(BMessage *message,
BHandler *handler);
virtual void MessageReceived(BMessage *message);
virtual void FrameMoved(BPoint newPosition);
virtual void WorkspacesChanged(uint32 oldWorkspaces,
virtual void Quit();
virtual void DispatchMessage(BMessage* message,
BHandler* handler);
virtual void MessageReceived(BMessage* message);
virtual void FrameMoved(BPoint newPosition);
virtual void WorkspacesChanged(uint32 oldWorkspaces,
uint32 newWorkspaces);
virtual void WorkspaceActivated(int32 workspaceIndex,
virtual void WorkspaceActivated(int32 workspaceIndex,
bool state);
virtual void FrameResized(float newWidth, float newHeight);
virtual void Minimize(bool minimize);
virtual void Zoom(BPoint recPosition, float recWidth,
virtual void FrameResized(float newWidth, float newHeight);
virtual void Minimize(bool minimize);
virtual void Zoom(BPoint recPosition, float recWidth,
float recHeight);
virtual void ScreenChanged(BRect screenFrame,
virtual void ScreenChanged(BRect screenFrame,
color_space depth);
virtual void MenusBeginning();
virtual void MenusEnded();
virtual void WindowActivated(bool state);
virtual void Show();
virtual void Hide();
virtual BHandler* ResolveSpecifier(BMessage *message,
int32 index, BMessage *specifier,
int32 form, const char *property);
virtual status_t GetSupportedSuites(BMessage *data);
virtual status_t Perform(perform_code code, void *arg);

private:
virtual void task_looper();
virtual BMessage* ConvertToMessage(void *raw, int32 code);
virtual void MenusBeginning();
virtual void MenusEnded();
virtual void WindowActivated(bool state);
virtual void Show();
virtual void Hide();
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 what, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code code, void* arg);

private:
virtual void task_looper();
virtual BMessage* ConvertToMessage(void* raw, int32 code);

public:
virtual void DirectConnected(direct_buffer_info *info);
status_t GetClippingRegion(BRegion *region,
BPoint *origin = NULL) const;
status_t SetFullScreen(bool enable);
bool IsFullScreen() const;
virtual void DirectConnected(direct_buffer_info* info);
status_t GetClippingRegion(BRegion* region,
BPoint* origin = NULL) const;
status_t SetFullScreen(bool enable);
bool IsFullScreen() const;

static bool SupportsWindowMode(
static bool SupportsWindowMode(
screen_id id = B_MAIN_SCREEN_ID);

private:
typedef BWindow inherited;
private:
typedef BWindow inherited;

virtual void _ReservedDirectWindow1();
virtual void _ReservedDirectWindow2();
virtual void _ReservedDirectWindow3();
virtual void _ReservedDirectWindow4();
virtual void _ReservedDirectWindow1();
virtual void _ReservedDirectWindow2();
virtual void _ReservedDirectWindow3();
virtual void _ReservedDirectWindow4();

BDirectWindow();
BDirectWindow(BDirectWindow& other);
BDirectWindow& operator=(BDirectWindow& other);
BDirectWindow& operator=(BDirectWindow& other);

static int32 _daemon_thread(void* arg);
int32 _DirectDaemon();
bool _LockDirect() const;
void _UnlockDirect() const;
static int32 _daemon_thread(void* arg);
int32 _DirectDaemon();
bool _LockDirect() const;
void _UnlockDirect() const;

void _InitData();
void _DisposeData();
void _InitData();
void _DisposeData();

bool fDaemonKiller;
bool fConnectionEnable;
bool fIsFullScreen;
bool _unused;
bool fInDirectConnect;
bool fDaemonKiller;
bool fConnectionEnable;
bool fIsFullScreen;
bool _unused;
bool fInDirectConnect;

int32 fDirectLock;
sem_id fDirectSem;
uint32 fDirectLockCount;
thread_id fDirectLockOwner;
char* fDirectLockStack;
int32 fDirectLock;
sem_id fDirectSem;
uint32 fDirectLockCount;
thread_id fDirectLockOwner;
char* fDirectLockStack;

sem_id fDisableSem;
sem_id fDisableSemAck;
sem_id fDisableSem;
sem_id fDisableSemAck;

uint32 fInitStatus;
uint32 fInfoAreaSize;
uint32 fInitStatus;
uint32 fInfoAreaSize;

uint32 _reserved[2];
uint32 _reserved[2];

area_id fClonedClippingArea;
area_id fSourceClippingArea;
thread_id fDirectDaemonId;
direct_buffer_info* fBufferDesc;
area_id fClonedClippingArea;
area_id fSourceClippingArea;
thread_id fDirectDaemonId;
direct_buffer_info* fBufferDesc;

uint32 _more_reserved_[17];
uint32 _more_reserved_[17];
};


Expand Down
5 changes: 2 additions & 3 deletions headers/os/game/FileGameSound.h
View file
Expand Up @@ -94,15 +94,14 @@ class BFileGameSound : public BStreamingGameSound {
size_t fFrameSize;
size_t fBufferSize;
size_t fPlayPosition;

thread_id fReadThread;
port_id fPort;

_gs_ramp* fPausing;
bool fPaused;
float fPauseGain;


uint32 _reserved[9];
};

Expand Down
49 changes: 25 additions & 24 deletions src/kits/game/DirectWindow.cpp
View file
@@ -1,10 +1,10 @@
/*
* Copyright 2003-2009, Haiku Inc.
* Copyright 2003-2009 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stefano Ceccherini <stefano.ceccherini@gmail.com>
* Carwyn Jones <turok2@currantbun.com>
*
* Distributed under the terms of the MIT License.
*/


Expand Down Expand Up @@ -164,7 +164,7 @@ print_direct_buffer_info(const direct_buffer_info &info)
// #pragma mark -


BDirectWindow::BDirectWindow(BRect frame, const char *title, window_type type,
BDirectWindow::BDirectWindow(BRect frame, const char* title, window_type type,
uint32 flags, uint32 workspace)
:
BWindow(frame, title, type, flags, workspace)
Expand All @@ -173,7 +173,7 @@ BDirectWindow::BDirectWindow(BRect frame, const char *title, window_type type,
}


BDirectWindow::BDirectWindow(BRect frame, const char *title, window_look look,
BDirectWindow::BDirectWindow(BRect frame, const char* title, window_look look,
window_feel feel, uint32 flags, uint32 workspace)
:
BWindow(frame, title, look, feel, flags, workspace)
Expand All @@ -191,15 +191,15 @@ BDirectWindow::~BDirectWindow()
// #pragma mark - BWindow API implementation


BArchivable *
BDirectWindow::Instantiate(BMessage *data)
BArchivable*
BDirectWindow::Instantiate(BMessage* data)
{
return NULL;
}


status_t
BDirectWindow::Archive(BMessage *data, bool deep) const
BDirectWindow::Archive(BMessage* data, bool deep) const
{
return inherited::Archive(data, deep);
}
Expand All @@ -213,14 +213,14 @@ BDirectWindow::Quit()


void
BDirectWindow::DispatchMessage(BMessage *message, BHandler *handler)
BDirectWindow::DispatchMessage(BMessage* message, BHandler* handler)
{
inherited::DispatchMessage(message, handler);
}


void
BDirectWindow::MessageReceived(BMessage *message)
BDirectWindow::MessageReceived(BMessage* message)
{
inherited::MessageReceived(message);
}
Expand Down Expand Up @@ -310,23 +310,24 @@ BDirectWindow::Hide()
}


BHandler *
BDirectWindow::ResolveSpecifier(BMessage *msg, int32 index,
BMessage *specifier, int32 form, const char *property)
BHandler*
BDirectWindow::ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 what, const char* property)
{
return inherited::ResolveSpecifier(msg, index, specifier, form, property);
return inherited::ResolveSpecifier(message, index, specifier, what,
property);
}


status_t
BDirectWindow::GetSupportedSuites(BMessage *data)
BDirectWindow::GetSupportedSuites(BMessage* data)
{
return inherited::GetSupportedSuites(data);
}


status_t
BDirectWindow::Perform(perform_code d, void *arg)
BDirectWindow::Perform(perform_code d, void* arg)
{
return inherited::Perform(d, arg);
}
Expand All @@ -339,8 +340,8 @@ BDirectWindow::task_looper()
}


BMessage *
BDirectWindow::ConvertToMessage(void *raw, int32 code)
BMessage*
BDirectWindow::ConvertToMessage(void* raw, int32 code)
{
return inherited::ConvertToMessage(raw, code);
}
Expand All @@ -350,14 +351,14 @@ BDirectWindow::ConvertToMessage(void *raw, int32 code)


void
BDirectWindow::DirectConnected(direct_buffer_info *info)
BDirectWindow::DirectConnected(direct_buffer_info* info)
{
// implemented in subclasses
}


status_t
BDirectWindow::GetClippingRegion(BRegion *region, BPoint *origin) const
BDirectWindow::GetClippingRegion(BRegion* region, BPoint* origin) const
{
if (region == NULL)
return B_BAD_VALUE;
Expand Down Expand Up @@ -452,9 +453,9 @@ BDirectWindow::SupportsWindowMode(screen_id id)


/*static*/ int32
BDirectWindow::_daemon_thread(void *arg)
BDirectWindow::_daemon_thread(void* arg)
{
return static_cast<BDirectWindow *>(arg)->_DirectDaemon();
return static_cast<BDirectWindow*>(arg)->_DirectDaemon();
}


Expand Down Expand Up @@ -521,7 +522,7 @@ BDirectWindow::_LockDirect() const
status_t status = B_OK;

#if DW_NEEDS_LOCKING
BDirectWindow *casted = const_cast<BDirectWindow *>(this);
BDirectWindow* casted = const_cast<BDirectWindow*>(this);

if (atomic_add(&casted->fDirectLock, 1) > 0) {
do {
Expand All @@ -543,7 +544,7 @@ void
BDirectWindow::_UnlockDirect() const
{
#if DW_NEEDS_LOCKING
BDirectWindow *casted = const_cast<BDirectWindow *>(this);
BDirectWindow* casted = const_cast<BDirectWindow*>(this);

if (atomic_add(&casted->fDirectLock, -1) > 1)
release_sem(casted->fDirectSem);
Expand Down

0 comments on commit 37fedaf

Please sign in to comment.