marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanups 

committer: Günther Brammer <gbrammer@gmx.de>
Günther Brammer 2009-05-09 14:37:37 +02:00
parent 9e08426f65
commit d6cd92c988
9 changed files with 6 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/inc/C4Version.h
View File

@ -25,6 +25,8 @@
#define C4EDITORCAPTION "Clonk Editor"
#define C4CFG_Company "RedWolf Design"
#define C4COPYRIGHT_YEAR "2008" // might make this dynamic some time...
#define C4COPYRIGHT_COMPANY "RedWolf Design GmbH"
#define C4VERSIONBUILDNAME "Blue"

2
engine/res/engine.rc
View File

@ -105,7 +105,7 @@ BEGIN
VALUE "PrivateBuild", "\0"
VALUE "ProductName", C4ENGINENAME "\0"
VALUE "Comments", "\0"
VALUE "CompanyName", "RedWolf Design GmbH\0"
VALUE "CompanyName", C4COPYRIGHT_COMPANY "\0"
END
END
BLOCK "VarFileInfo"

9
engine/src/C4Console.cpp
View File

@ -1087,8 +1087,7 @@ BOOL C4Console::FileSelect(char *sFilename, int iSize, const char * szFilter, DW
if((dwFlags & OFN_FILEMUSTEXIST) && !g_file_test(filename, G_FILE_TEST_IS_REGULAR))
{
sprintf(OSTR, "File \"%s\" does not exist", filename);
Message(OSTR, false);
Message(FormatString("File \"%s\" does not exist", filename).getData(), false);
error = true;
}
@ -1208,9 +1207,6 @@ BOOL C4Console::FileQuit()
return TRUE;
}
#define C4COPYRIGHT_YEAR "2008" // might make this dynamic some time...
#define C4COPYRIGHT_COMPANY "RedWolf Design GmbH"
void C4Console::HelpAbout()
{
StdStrBuf strCopyright;
@ -1800,8 +1796,7 @@ void C4Console::OnPlrJoin(GtkWidget* item, gpointer data)
void C4Console::OnPlrQuit(GtkWidget* item, gpointer data)
{
sprintf(OSTR, "EliminatePlayer(%d)", GPOINTER_TO_INT(data));
Game.Control.Input.Add(CID_Script, new C4ControlScript(OSTR));
Game.Control.Input.Add(CID_Script, new C4ControlScript(FormatString("EliminatePlayer(%d)", GPOINTER_TO_INT(data)).getData()));
}
void C4Console::OnViewNew(GtkWidget* item, gpointer data)

2
group/Resource.rc
View File

@ -51,7 +51,7 @@ BEGIN
VALUE "SpecialBuild", C4BUILDOPT "\0"
VALUE "ProductVersion", C4VERSION "\0"
VALUE "Comments", "\0"
VALUE "CompanyName", "RedWolf Design GmbH\0"
VALUE "CompanyName", C4COPYRIGHT_COMPANY "\0"
VALUE "InternalName", "c4group\0"
VALUE "LegalCopyright", "Copyright © 2003-2007 RedWolf Design GmbH\0"
VALUE "LegalTrademarks", "\0"

2
standard/inc/StdWindow.h
View File

@ -438,7 +438,6 @@ protected:
bool IsShiftDown() { return KeyMask & MK_SHIFT; }
bool IsControlDown() { return KeyMask & MK_CONTROL; }
bool IsAltDown() { return KeyMask & (1<<3); }
bool SignalNetworkEvent();
bool AssertMainThread()
{
assert(MainThread == pthread_self());
@ -448,7 +447,6 @@ protected:
// the glib main loop that are in an anonymous namespace in
// StdXApp.cpp.
void OnXInput();
void OnPipeInput();
void OnStdInInput();
protected:
#if defined(USE_SDL_MAINLOOP)

17
standard/src/StdSDLApp.cpp
View File

@ -186,10 +186,6 @@ C4AppHandleResult CStdApp::HandleMessage(unsigned int iTimeout, bool fCheckTimer
return HR_Timeout;
default:
// flush pipe
if(FD_ISSET(this->Pipe[0], &rfds)) {
OnPipeInput();
}
return HR_Message;
}
}
@ -282,19 +278,6 @@ bool CStdApp::ReadStdInCommand() {
return true;
}
bool CStdApp::SignalNetworkEvent() {
char c = 1;
write(this->Pipe[1], &c, 1);
return true;
}
void CStdApp::OnPipeInput() {
char c;
::read(this->Pipe[0], &c, 1);
// call network class to handle it
OnNetworkEvents();
}
void CStdApp::MessageDialog(const char * message)
{
// FIXME: At least for macosx something could be done here

18
standard/src/StdTApp.cpp
View File

@ -205,10 +205,6 @@ C4AppHandleResult CStdApp::HandleMessage(unsigned int iTimeout, bool fCheckTimer
return HR_Timeout;
default:
// flush pipe
if(FD_ISSET(Priv->Pipe[0], &rfds)) {
OnPipeInput();
}
#ifdef USE_CONSOLE
// handle commands
if(FD_ISSET(0, &rfds))
@ -223,12 +219,6 @@ C4AppHandleResult CStdApp::HandleMessage(unsigned int iTimeout, bool fCheckTimer
}
}
bool CStdApp::SignalNetworkEvent() {
char c = 1;
write(Priv->Pipe[1], &c, 1);
return true;
}
bool CStdApp::GetIndexedDisplayMode(int32_t iIndex, int32_t *piXRes, int32_t *piYRes, int32_t *piBitDepth, uint32_t iMonitor) {
return false;
}
@ -305,14 +295,6 @@ bool CStdDDraw::SaveDefaultGammaRamp(CStdWindow * pWindow)
return true;
}
void CStdApp::OnPipeInput()
{
char c;
::read(Priv->Pipe[0], &c, 1);
// call network class to handle it
OnNetworkEvents();
}
void CStdApp::OnStdInInput()
{
if(!ReadStdInCommand())

230
standard/src/StdXApp.cpp
View File

@ -75,27 +75,6 @@ static CStdApp * readline_callback_use_this_app = 0;
namespace
{
#ifdef WITH_GLIB
// Callbacks from Glib main loop
gboolean OnXInputStatic(GIOChannel* channel, GIOCondition condition, gpointer data)
{
static_cast<CStdApp*>(data)->OnXInput();
return TRUE;
}
gboolean OnPipeInputStatic(GIOChannel* channel, GIOCondition condition, gpointer data)
{
static_cast<CStdApp*>(data)->OnPipeInput();
return TRUE;
}
gboolean OnStdInInputStatic(GIOChannel* channel, GIOCondition condition, gpointer data)
{
static_cast<CStdApp*>(data)->OnStdInInput();
return TRUE;
}
#endif
unsigned int KeyMaskFromKeyEvent(Display* dpy, XKeyEvent* xkey)
{
unsigned int mask = xkey->state;
@ -159,14 +138,6 @@ bool CStdApp::Init(int argc, char * argv[]) {
s.append("\"");
szCmdLine = s.c_str();
#ifdef WITH_GLIB
Priv->loop = g_main_loop_new(NULL, FALSE);
Priv->pipe_channel = NULL;
Priv->x_channel = NULL;
Priv->stdin_channel = NULL;
#endif
if(!(dpy = XOpenDisplay (0))) {
Log("Error opening display.");
return false;
@ -205,10 +176,6 @@ bool CStdApp::Init(int argc, char * argv[]) {
"_NET_WM_STATE_DEMANDS_ATTENTION" };
XInternAtoms(dpy, const_cast<char **>(PrefetchAtomnames), 8, true, PrefetchAtoms);
#ifdef WITH_GLIB
Priv->x_channel = g_io_channel_unix_new(XConnectionNumber(dpy));
g_io_add_watch(Priv->x_channel, G_IO_IN, &OnXInputStatic, this);
#endif
#if USE_CONSOLE && HAVE_LIBREADLINE
rl_callback_handler_install (">", readline_callback);
readline_callback_use_this_app = this;
@ -217,16 +184,6 @@ bool CStdApp::Init(int argc, char * argv[]) {
Priv->stdin_channel = g_io_channel_unix_new(STDIN_FILENO);
g_io_add_watch(Priv->stdin_channel, G_IO_IN, &OnStdInInputStatic, this);
#endif
#endif
// create pipe
if(pipe(Priv->Pipe) != 0) {
Log("Error creating Pipe");
return false;
}
#ifdef WITH_GLIB
Priv->pipe_channel = g_io_channel_unix_new(Priv->Pipe[0]);
g_io_add_watch(Priv->pipe_channel, G_IO_IN, &OnPipeInputStatic, this);
#endif
// Custom initialization
@ -238,24 +195,11 @@ void CStdApp::Clear() {
dpy = 0;
#if USE_CONSOLE && HAVE_LIBREADLINE
rl_callback_handler_remove();
#endif
// close pipe
close(Priv->Pipe[0]);
close(Priv->Pipe[1]);
#ifdef WITH_GLIB
g_main_loop_unref(Priv->loop);
if(Priv->pipe_channel) g_io_channel_unref(Priv->pipe_channel);
if(Priv->x_channel) g_io_channel_unref(Priv->x_channel);
if(Priv->stdin_channel) g_io_channel_unref(Priv->stdin_channel);
#endif
}
void CStdApp::Quit() {
fQuitMsgReceived = true;
#ifdef WITH_GLIB
//g_main_loop_quit(Priv->loop);
#endif
}
bool CStdApp::FlushMessages() {
@ -267,178 +211,12 @@ bool CStdApp::FlushMessages() {
return Priv->X11Proc.Execute(0);
}
/*
void CStdApp::Execute () {
time_t seconds = LastExecute.tv_sec;
timeval tv;
gettimeofday(&tv, 0);
// Too slow?
if(DoNotDelay) {
DoNotDelay = false;
LastExecute = tv;
} else if (LastExecute.tv_sec < tv.tv_sec - 2) {
LastExecute = tv;
} else {
LastExecute.tv_usec += Delay;
if (LastExecute.tv_usec > 1000000) {
++LastExecute.tv_sec;
LastExecute.tv_usec -= 1000000;
}
}
// This will make the FPS look "prettier" in some situations
// But who cares...
if (seconds != LastExecute.tv_sec) {
pWindow->Sec1Timer();
}
}
void CStdApp::NextTick(bool fYield) {
DoNotDelay = true;
}*/
/*
void CStdApp::Run() {
// Main message loop
while (true) if (HandleMessage(INFINITE, true) == HR_Failure) return;
}
void CStdApp::ResetTimer(unsigned int d) { Delay = 1000 * d; }
*/
#ifdef WITH_GLIB
namespace {
// Just indicate that the timeout elapsed
gboolean HandleMessageTimeout(gpointer data) { *static_cast<bool*>(data) = true; return FALSE; }
}
#endif
/*
C4AppHandleResult CStdApp::HandleMessage(unsigned int iTimeout, bool fCheckTimer) {
// quit check for nested HandleMessage-calls
if (fQuitMsgReceived) return HR_Failure;
bool do_execute = fCheckTimer;
// Wait Delay microseconds.
timeval tv = { 0, 0 };
if (DoNotDelay) {
// nothing to do
} else if (fCheckTimer) {
gettimeofday(&tv, 0);
tv.tv_usec = LastExecute.tv_usec - tv.tv_usec + Delay
- 1000000 * (tv.tv_sec - LastExecute.tv_sec);
// Check if the given timeout comes first
// (don't call Execute then, because it assumes it has been called because of a timer event!)
if (iTimeout != INFINITE && iTimeout * 1000 < tv.tv_usec) {
tv.tv_usec = iTimeout * 1000;
do_execute = false;
}
if (tv.tv_usec < 0)
tv.tv_usec = 0;
tv.tv_sec = 0;
} else {
tv.tv_usec = iTimeout * 1000;
}
// Handle pending X messages
//while (XEventsQueued(dpy, QueuedAlready)) {
while (XPending(dpy)) {
HandleXMessage();
}
#ifdef WITH_GLIB
// Timeout in milliseconds
unsigned int timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
bool timeout_elapsed = false;
guint timeout_handle = 0;
// Guarantee that we do not block until something interesting occurs
// when using a timeout
if(fCheckTimer || iTimeout != INFINITE)
{
// The timeout handler sets timeout_elapsed to true when
// the timeout elpased, this is required for a correct return
// value.
timeout_handle = g_timeout_add_full(
G_PRIORITY_HIGH,
timeout,
&HandleMessageTimeout,
&timeout_elapsed,
NULL
);
}
g_main_context_iteration(g_main_loop_get_context(Priv->loop), TRUE);
if(timeout_handle && !timeout_elapsed)
{
// FIXME: do not add a new timeout instead of deleting the old one in the next call
g_source_remove(timeout_handle);
}
if(timeout_elapsed && do_execute)
{
Execute();
}
while(g_main_context_pending(g_main_loop_get_context(Priv->loop)))
g_main_context_iteration(g_main_loop_get_context(Priv->loop), FALSE);
return timeout_elapsed ? (do_execute ? HR_Timer : HR_Timeout) : HR_Message;
#else // WITH_GLIB
// Watch dpy to see when it has input.
int max_fd = 0;
fd_set rfds;
FD_ZERO(&rfds);
// Stop waiting for the next frame when more events arrive
XFlush(dpy);
FD_SET(XConnectionNumber(dpy), &rfds);
max_fd = Max(XConnectionNumber(dpy), max_fd);
#ifdef USE_CONSOLE
// Wait for commands from stdin
FD_SET(0, &rfds);
#endif
// And for events from the network thread
FD_SET(Priv->Pipe[0], &rfds);
max_fd = Max(Priv->Pipe[0], max_fd);
switch (select(max_fd + 1, &rfds, NULL, NULL, (fCheckTimer || iTimeout != INFINITE) ? &tv : NULL)) {
// error
case -1:
if (errno == EINTR) return HR_Message;
Log(strerror(errno));
Log("select error.");
return HR_Failure;
// timeout
case 0:
if (do_execute) {
Execute();
return HR_Timer;
}
return HR_Timeout;
default:
// flush pipe
if(FD_ISSET(Priv->Pipe[0], &rfds)) {
OnPipeInput();
}
if(FD_ISSET(XConnectionNumber(dpy), &rfds)) {
OnXInput();
}
#ifdef USE_CONSOLE
// handle commands
if(FD_ISSET(0, &rfds))
{
// Do not call OnStdInInput to be able to return
// HR_Failure when ReadStdInCommand returns false
if(!ReadStdInCommand())
return HR_Failure;
}
#endif
return HR_Message;
}
#endif // !WITH_GLIB
}
*/
bool CStdApp::SignalNetworkEvent() {
char c = 1;
write(Priv->Pipe[1], &c, 1);
return true;
}
void CStdApp::HandleXMessage() {
XEvent event;
@ -839,14 +617,6 @@ void CStdApp::OnXInput()
}
}
void CStdApp::OnPipeInput()
{
char c;
::read(Priv->Pipe[0], &c, 1);
// call network class to handle it
/*OnNetworkEvents();*/
}
void CStdApp::OnStdInInput()
{
if(!ReadStdInCommand())

8
standard/src/StdXPrivate.h
View File

@ -84,12 +84,6 @@ public:
class CStdAppPrivate {
public:
#ifdef WITH_GLIB
GMainLoop* loop;
// IOChannels required to wake up the main loop
GIOChannel* pipe_channel;
GIOChannel* x_channel;
GIOChannel* stdin_channel;
CGLibProc GLibProc;
#endif
@ -129,8 +123,6 @@ class CStdAppPrivate {
CX11Proc X11Proc;
#endif
int argc; char ** argv;
// Used to signal a network event
int Pipe[2];
};
#endif // INC_STD_X_PRIVATE_H