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

Style cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39447 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-16 16:01:11 +00:00
parent 53cd28e9d5
commit 91eec68cf1
2 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermApp.h
+46 -37
View File
@@ -1,7 +1,7 @@
/* /*
* Copyright 2001-2008, Haiku. * Copyright 2001-2010, Haiku.
* Copyright (c) 2003-4 Kian Duffy <[email protected]> * Copyright (c) 2003-4 Kian Duffy <[email protected]>
* Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files or portions * a copy of this software and associated documentation files or portions
@@ -37,51 +37,60 @@
#include <File.h> #include <File.h>
#include <String.h> #include <String.h>
class Arguments; class Arguments;
class BRect; class BRect;
class BWindow; class BWindow;
class TermApp : public BApplication { class TermApp : public BApplication {
public: public:
TermApp(); TermApp();
virtual ~TermApp(); virtual ~TermApp();
protected: protected:
void ReadyToRun(); void ReadyToRun();
void Quit(); void Quit();
void AboutRequested(); void AboutRequested();
void MessageReceived(BMessage* message); void MessageReceived(BMessage* message);
void RefsReceived(BMessage* message); void RefsReceived(BMessage* message);
void ArgvReceived(int32 argc, char** argv); void ArgvReceived(int32 argc, char** argv);
private: private:
status_t _MakeTermWindow(BRect& frame, uint32 workspaces); status_t _MakeTermWindow(BRect& frame,
status_t _GetWindowPositionFile(BFile* file, uint32 openMode); uint32 workspaces);
status_t _LoadWindowPosition(BRect* frame, uint32* workspaces); status_t _GetWindowPositionFile(BFile* file,
status_t _SaveWindowPosition(BMessage* message); uint32 openMode);
void _SwitchTerm(); status_t _LoadWindowPosition(BRect* frame,
void _ActivateTermWindow(team_id id); uint32* workspaces);
bool _IsSwitchTarget(team_id id); status_t _SaveWindowPosition(BMessage* message);
void _SanitizeIDs(BMessage* data, uint8* windows, ssize_t length); void _SwitchTerm();
bool _UpdateIDs(bool set, uint8* windows, ssize_t maxLength, void _ActivateTermWindow(team_id id);
ssize_t* _length); bool _IsSwitchTarget(team_id id);
void _UpdateRegistration(bool set); void _SanitizeIDs(BMessage* data, uint8* windows,
void _UnregisterTerminal(); ssize_t length);
void _RegisterTerminal(); bool _UpdateIDs(bool set, uint8* windows,
ssize_t maxLength, ssize_t* _length);
void _UpdateRegistration(bool set);
void _UnregisterTerminal();
void _RegisterTerminal();
void _HandleChildCleanup(); void _HandleChildCleanup();
static void _SigChildHandler(int signal, void* data); static void _SigChildHandler(int signal, void* data);
static status_t _ChildCleanupThread(void* data); static status_t _ChildCleanupThread(void* data);
void _Usage(char *name); void _Usage(char *name);
bool fStartFullscreen; private:
BString fWindowTitle; bool fStartFullscreen;
int32 fWindowNumber; BString fWindowTitle;
int32 fWindowNumber;
BWindow* fTermWindow; BWindow* fTermWindow;
BRect fTermFrame; BRect fTermFrame;
uint32 fTermWorkspaces; uint32 fTermWorkspaces;
Arguments *fArgs; Arguments* fArgs;
}; };
#endif // TERM_APP_H #endif // TERM_APP_H
src/apps/terminal/TermWindow.h
+70 -67
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2007, Haiku. * Copyright 2001-2010, Haiku.
* Copyright (c) 2003-4 Kian Duffy <[email protected]> * Copyright (c) 2003-4 Kian Duffy <[email protected]>
* Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
* *
@@ -28,13 +28,14 @@
* THE SOFTWARE. * THE SOFTWARE.
* *
*/ */
#ifndef __TERMWINDOW_H #ifndef TERM_WINDOW_H
#define __TERMWINDOW_H #define TERM_WINDOW_H
#include <String.h> #include <String.h>
#include <Window.h> #include <Window.h>
class Arguments; class Arguments;
class BFont; class BFont;
class BMenu; class BMenu;
@@ -48,82 +49,84 @@ class TermViewContainerView;
class TermWindow : public BWindow { class TermWindow : public BWindow {
public: public:
TermWindow(BRect frame, const char* title, uint32 workspaces, TermWindow(BRect frame, const char* title,
Arguments *args); uint32 workspaces, Arguments* args);
virtual ~TermWindow(); virtual ~TermWindow();
void SetSessionWindowTitle(TermView* termView, void SetSessionWindowTitle(TermView* termView,
const char* title); const char* title);
void SessionChanged(); void SessionChanged();
protected: protected:
virtual bool QuitRequested(); virtual bool QuitRequested();
virtual void MessageReceived(BMessage *message); virtual void MessageReceived(BMessage* message);
virtual void WindowActivated(bool); virtual void WindowActivated(bool);
virtual void MenusBeginning(); virtual void MenusBeginning();
virtual void Zoom(BPoint leftTop, float width, float height); virtual void Zoom(BPoint leftTop, float width, float height);
virtual void FrameResized(float newWidth, float newHeight); virtual void FrameResized(float newWidth, float newHeight);
private: private:
struct Session; struct Session;
class TabView; class TabView;
friend class TabView; friend class TabView;
void _SetTermColors(TermViewContainerView *termView); void _SetTermColors(TermViewContainerView* termView);
void _InitWindow(); void _InitWindow();
void _SetupMenu(); void _SetupMenu();
static BMenu* _MakeEncodingMenu(); static BMenu* _MakeEncodingMenu();
static BMenu* _MakeWindowSizeMenu(); static BMenu* _MakeWindowSizeMenu();
void _GetPreferredFont(BFont &font);
status_t _DoPageSetup();
void _DoPrint();
void _AddTab(Arguments *args);
void _RemoveTab(int32 index);
bool _CanClose(int32 index);
TermViewContainerView* _ActiveTermViewContainerView() const;
TermViewContainerView* _TermViewContainerViewAt(int32 index) const;
TermView* _ActiveTermView() const;
TermView* _TermViewAt(int32 index) const;
int32 _IndexOfTermView(TermView* termView) const;
void _CheckChildren();
void _ResizeView(TermView *view);
int32 _NewSessionID();
BString fInitialTitle; void _GetPreferredFont(BFont &font);
BList fSessions; status_t _DoPageSetup();
void _DoPrint();
void _AddTab(Arguments* args);
void _RemoveTab(int32 index);
bool _CanClose(int32 index);
TermViewContainerView* _ActiveTermViewContainerView() const;
TermViewContainerView* _TermViewContainerViewAt(int32 index) const;
TermView* _ActiveTermView() const;
TermView* _TermViewAt(int32 index) const;
int32 _IndexOfTermView(TermView* termView) const;
void _CheckChildren();
void _ResizeView(TermView* view);
TabView *fTabView; int32 _NewSessionID();
TermView *fTermView;
BMenuBar *fMenubar; private:
BMenu *fFilemenu; BString fInitialTitle;
BMenu *fEditmenu; BList fSessions;
BMenu *fEncodingmenu;
BMenu *fHelpmenu;
BMenu *fWindowSizeMenu;
BMenu *fSizeMenu;
BMessage *fPrintSettings; TabView* fTabView;
PrefWindow *fPrefWindow; TermView* fTermView;
FindWindow *fFindPanel;
BRect fSavedFrame;
window_look fSavedLook;
// Saved search parameters BMenuBar* fMenubar;
BString fFindString; BMenu* fFilemenu;
BMenuItem *fFindNextMenuItem; BMenu* fEditmenu;
BMenuItem *fFindPreviousMenuItem; BMenu* fEncodingmenu;
BMenuItem *fIncreaseFontSizeMenuItem; BMenu* fHelpmenu;
BMenuItem *fDecreaseFontSizeMenuItem; BMenu* fWindowSizeMenu;
BMenu* fSizeMenu;
bool fFindSelection; BMessage* fPrintSettings;
bool fForwardSearch; PrefWindow* fPrefWindow;
bool fMatchCase; FindWindow* fFindPanel;
bool fMatchWord; BRect fSavedFrame;
window_look fSavedLook;
bool fFullScreen; // Saved search parameters
BString fFindString;
BMenuItem* fFindNextMenuItem;
BMenuItem * fFindPreviousMenuItem;
BMenuItem* fIncreaseFontSizeMenuItem;
BMenuItem* fDecreaseFontSizeMenuItem;
bool fFindSelection;
bool fForwardSearch;
bool fMatchCase;
bool fMatchWord;
bool fFullScreen;
}; };
#endif // __TERMWINDOW_H
#endif // TERM_WINDOW_H