[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/core missing.cpp,1.1,1.2 pgtimerobject.cp
|
From: |
Alexander Pipelka <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/src/core missing.cpp,1.1,1.2 pgtimerobject.cpp,1.1,1.2 physfsrwops.cpp,1.1,1.2 Makefile.am,1.4,1.5 pgapplication.cpp,1.11,1.12 pgdatacontainer.cpp,1.1,1.2 pgfile.cpp,1.1,1.2 pgfilearchive.cpp,1.5,1.6 pgfilelist.cpp,1.1,1.2 pglog.cpp,1.1,1.2 pgmain.cpp,1.1,1.2 pgmessageobject.cpp,1.8,1.9 pgnavigator.cpp,1.2,1.3 pgrectlist.cpp,1.2,1.3 pgsurfacecache.cpp,1.3,1.4 physfsrwops.c,1.1,NONE |
|
Date: |
Sun, 18 Aug 2002 04:12:55 -0400 |
Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv12482/src/core
Modified Files:
Makefile.am pgapplication.cpp pgdatacontainer.cpp pgfile.cpp
pgfilearchive.cpp pgfilelist.cpp pglog.cpp pgmain.cpp
pgmessageobject.cpp pgnavigator.cpp pgrectlist.cpp
pgsurfacecache.cpp
Added Files:
missing.cpp pgtimerobject.cpp physfsrwops.cpp
Removed Files:
physfsrwops.c
Log Message:
synced with the devel-1-0-x tree.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.am 29 Apr 2002 11:44:22 -0000 1.4
--- Makefile.am 18 Aug 2002 08:12:52 -0000 1.5
***************
*** 2,6 ****
libpgcore_la_SOURCES = \
! physfsrwops.c \
pgdatacontainer.cpp \
pgapplication.cpp \
--- 2,7 ----
libpgcore_la_SOURCES = \
! physfsrwops.cpp \
! missing.cpp \
pgdatacontainer.cpp \
pgapplication.cpp \
***************
*** 14,25 ****
pgnavigator.cpp \
pgrectlist.cpp \
! pgsurfacecache.cpp
! libpgcore_la_LIBADD =
INCLUDES = \
$(SIGC_CFLAGS) \
$(SDL_CFLAGS) \
! -I$(top_srcdir)/src/physfs \
-I$(top_srcdir)/include
--- 15,31 ----
pgnavigator.cpp \
pgrectlist.cpp \
! pgsurfacecache.cpp \
! pgtimerobject.cpp
! libpgcore_la_LIBADD =
!
! EXTRA_DIST = \
! physfsrwops.h \
! pgmsgmap.h
INCLUDES = \
$(SIGC_CFLAGS) \
$(SDL_CFLAGS) \
! $(PHYSFS_INCLUDE) \
-I$(top_srcdir)/include
Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** pgapplication.cpp 25 Jun 2002 20:38:42 -0000 1.11
--- pgapplication.cpp 18 Aug 2002 08:12:52 -0000 1.12
***************
*** 2,16 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
--- 2,16 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
***************
*** 19,23 ****
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 19,23 ----
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 27,35 ****
*/
- #include <iostream>
- #include <cstring>
- #include <cassert>
- #include <cmath>
-
#include "pgapplication.h"
#include "pgwidget.h"
--- 27,30 ----
***************
*** 39,49 ****
#include "pgtheme.h"
// usually PARAGUI_THEMEDIR is defined by the configure script
// or passed to the compiler. This is just a kind of last resort.
#ifndef PARAGUI_THEMEDIR
! #define PARAGUI_THEMEDIR "./"
! #endif // PARAGUI_THEMEDIR
!
SDL_mutex* PG_Application::mutexScreen = NULL;
--- 34,52 ----
#include "pgtheme.h"
+ #include <iostream>
+ #include <cstring>
+ #include <cassert>
+ #include <cmath>
+
// usually PARAGUI_THEMEDIR is defined by the configure script
// or passed to the compiler. This is just a kind of last resort.
#ifndef PARAGUI_THEMEDIR
! #ifdef __MACOS__
! #define PARAGUI_THEMEDIR ""
! #else
! #define PARAGUI_THEMEDIR "./"
! #endif // macintosh
! #endif // PARAGUI_THEMEDIR
SDL_mutex* PG_Application::mutexScreen = NULL;
***************
*** 57,72 ****
bool PG_Application::enableBackground = true;
bool PG_Application::enableAppIdleCalls = false;
! SDL_Surface *PG_Application::my_mouse_pointer;
PG_Rect PG_Application::my_mouse_position = PG_Rect(0,0,0,0);
PG_CURSOR_MODE PG_Application::my_mouse_mode = PG_CURSOR_HARDWARE;
PG_Font* PG_Application::DefaultFont = NULL;
! SDL_Surface* PG_Application::my_background;
! SDL_Surface* PG_Application::my_scaled_background;
SDL_Color PG_Application::my_backcolor;
! int PG_Application::my_backmode;
! bool PG_Application::my_quitEventLoop = false;
std::vector<PG_MessageObject*> PG_Application::objectList;
PG_Widget* PG_Application::lastwidget = NULL;
!
/**
new shutdown procedure (called at application termination
--- 60,75 ----
bool PG_Application::enableBackground = true;
bool PG_Application::enableAppIdleCalls = false;
! SDL_Surface *PG_Application::my_mouse_pointer = NULL;
PG_Rect PG_Application::my_mouse_position = PG_Rect(0,0,0,0);
PG_CURSOR_MODE PG_Application::my_mouse_mode = PG_CURSOR_HARDWARE;
PG_Font* PG_Application::DefaultFont = NULL;
! SDL_Surface* PG_Application::my_background = NULL;
! SDL_Surface* PG_Application::my_scaled_background = NULL;
SDL_Color PG_Application::my_backcolor;
! int PG_Application::my_backmode = BKMODE_TILE;
! bool PG_Application::disableDirtyUpdates = false;
std::vector<PG_MessageObject*> PG_Application::objectList;
PG_Widget* PG_Application::lastwidget = NULL;
! bool PG_Application::my_quitEventLoop = false;
/**
new shutdown procedure (called at application termination
***************
*** 76,85 ****
PG_LogConsole::Done();
- // remove all archives from PG_FileArchive
- PG_FileArchive::RemoveAllArchives();
-
- // shutdown PhysFS
- PG_FileArchive::Deinit();
-
// shutdown SDL
SDL_Quit();
--- 79,82 ----
***************
*** 108,112 ****
/* Initialize the SDL library */
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
! PG_LogERR("Could not initialize SDL: %s", SDL_GetError());
exit(-1);
}
--- 105,109 ----
/* Initialize the SDL library */
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
! std::cerr << "Could not initialize SDL: " << SDL_GetError() <<
std::endl;
exit(-1);
}
***************
*** 119,122 ****
--- 116,122 ----
my_freeBackground = false;
my_backmode = BKMODE_TILE;
+
+ // add our base dir to the searchpath
+ AddArchive(GetBaseDir());
}
***************
*** 124,127 ****
--- 124,130 ----
//pGlobalApp = NULL;
Shutdown();
+
+ // remove all archives from PG_FileArchive
+ PG_FileArchive::RemoveAllArchives();
}
***************
*** 255,260 ****
/** */
bool PG_Application::eventKeyDown(const SDL_KeyboardEvent* key) {
!
! if (key->keysym.sym == PG_LOGCONSOLE_KEY) {
PG_LogConsole::Update();
PG_LogConsole::Toggle();
--- 258,268 ----
/** */
bool PG_Application::eventKeyDown(const SDL_KeyboardEvent* key) {
! SDLKey ckey = PG_LogConsole::GetConsoleKey();
!
! if(ckey == 0) {
! return false;
! }
!
! if (key->keysym.sym == ckey) {
PG_LogConsole::Update();
PG_LogConsole::Toggle();
***************
*** 412,421 ****
PG_Rect fillrect = rect;
- //PG_Application::LockScreen();
if(!my_background) {
SDL_Color c = my_backcolor;
SDL_FillRect(screen, (SDL_Rect*)&fillrect,
SDL_MapRGB(screen->format, c.r, c.g, c.b));
- PG_Application::UnlockScreen();
return;
}
--- 420,427 ----
***************
*** 436,440 ****
SDL_GetClipRect(screen, (SDL_Rect*)&fillrect);
SDL_SetClipRect(screen, (SDL_Rect*)&rect);
! SDL_BlitSurface(my_scaled_background, 0, screen, 0);
SDL_SetClipRect(screen, (SDL_Rect*)&fillrect);
--- 442,446 ----
SDL_GetClipRect(screen, (SDL_Rect*)&fillrect);
SDL_SetClipRect(screen, (SDL_Rect*)&rect);
! SDL_BlitSurface(my_scaled_background, (SDL_Rect*)&rect, screen,
(SDL_Rect*)&rect);
SDL_SetClipRect(screen, (SDL_Rect*)&fillrect);
***************
*** 442,447 ****
PG_Draw::DrawTile(screen, screenrect, rect, my_background);
}
-
- //PG_Application::UnlockScreen();
}
--- 448,451 ----
***************
*** 537,550 ****
PG_LogDBG("Locating theme '%s' ...", xmltheme);
- // MacOS does not use file path separator '/', instead ':' is used
- // There could be clever solution for this, but for a while...
- // let's assume that "data" directory must exist in working directory
on MacOS.
- // Masahiro Minami<address@hidden>
- // 01/05/06
-
- // add paths to the archive
-
- //#ifndef macintosh
-
if(searchpath != NULL) {
if(AddArchive(searchpath)) {
--- 541,544 ----
***************
*** 553,556 ****
--- 547,574 ----
}
+ #ifdef __MACOS__
+
+ if(AddArchive("")) {
+ PG_LogDBG("'' added to searchpath");
+ }
+
+ if(AddArchive(":")) {
+ PG_LogDBG("':' added to searchpath");
+ }
+
+ if(AddArchive(":data:")) {
+ PG_LogDBG("':data:' added to searchpath");
+ }
+
+ if(AddArchive("::data:")) {
+ PG_LogDBG("'::data:' added to searchpath");
+ }
+
+ if(PARAGUI_THEMEDIR != NULL) {
+ PG_LogDBG("'"PARAGUI_THEMEDIR"' added to searchpath");
+ }
+
+ #else
+
if(AddArchive("./")) {
PG_LogDBG("'./' added to searchpath");
***************
*** 575,578 ****
--- 593,598 ----
}
+ #endif // __MACOS__
+
if(AddArchive(PARAGUI_THEMEDIR)) {
PG_LogDBG("'"PARAGUI_THEMEDIR "' added to searchpath");
***************
*** 947,954 ****
case SDL_SYSWMEVENT:
return eventSysWM(&event->syswm);
!
case SDL_USEREVENT:
return false;
!
case SDL_QUIT:
return eventQuit(&event->quit);
--- 967,974 ----
case SDL_SYSWMEVENT:
return eventSysWM(&event->syswm);
!
case SDL_USEREVENT:
return false;
!
case SDL_QUIT:
return eventQuit(&event->quit);
***************
*** 963,967 ****
break;
}
!
// events related to objects/widgets
switch(event->type) {
--- 983,987 ----
break;
}
!
// events related to objects/widgets
switch(event->type) {
***************
*** 1012,1020 ****
bool PG_Application::UnregisterObject(PG_MessageObject* obj) {
!
if (lastwidget == obj) {
lastwidget = NULL;
}
!
std::vector<PG_MessageObject*>::iterator list = objectList.begin();
--- 1032,1040 ----
bool PG_Application::UnregisterObject(PG_MessageObject* obj) {
!
if (lastwidget == obj) {
lastwidget = NULL;
}
!
std::vector<PG_MessageObject*>::iterator list = objectList.begin();
***************
*** 1196,1199 ****
--- 1216,1227 ----
}
}
+ }
+
+ void PG_Application::DisableDirtyUpdates(bool disable) {
+ disableDirtyUpdates = disable;
+ }
+
+ bool PG_Application::GetDirtyUpdatesDisabled() {
+ return disableDirtyUpdates;
}
Index: pgdatacontainer.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgdatacontainer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgdatacontainer.cpp 15 Apr 2002 14:53:56 -0000 1.1
--- pgdatacontainer.cpp 18 Aug 2002 08:12:52 -0000 1.2
***************
*** 30,33 ****
--- 30,38 ----
PG_DataContainer::PG_DataContainer(Uint32 size) {
+ if(size == 0) {
+ my_data = NULL;
+ my_size = 0;
+ }
+
my_data = new char[size];
my_size = size;
***************
*** 35,39 ****
PG_DataContainer::~PG_DataContainer() {
! delete[] my_data;
}
--- 40,46 ----
PG_DataContainer::~PG_DataContainer() {
! if(my_data != NULL) {
! delete[] my_data;
! }
}
Index: pgfile.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfile.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgfile.cpp 15 Apr 2002 14:53:56 -0000 1.1
--- pgfile.cpp 18 Aug 2002 08:12:52 -0000 1.2
***************
*** 78,79 ****
--- 78,111 ----
return PHYSFS_fileLength((PHYSFS_file*)file);
}
+
+ char PG_File::getc() {
+ char buffer = 0;
+
+ if(read(&buffer, 1) == 1) {
+ return buffer;
+ }
+ return 0;
+ }
+
+ std::string PG_File::getline() {
+ std::string result;
+ char c = 0;
+
+ c = getc();
+ while(!eof() && (c != 0x0A)) {
+ if(c != 0x0D) {
+ result += c;
+ }
+ c = getc();
+ }
+
+ return result;
+ }
+
+ void PG_File::putline(const std::string& line) {
+ // write characters
+ write((void*)line.c_str(), line.size());
+
+ // write CR (LF?)
+ write((void*)"\n", strlen("\n"));
+ }
Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgfilearchive.cpp 18 Aug 2002 01:14:41 -0000 1.5
--- pgfilearchive.cpp 18 Aug 2002 08:12:52 -0000 1.6
***************
*** 2,20 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
--- 2,20 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
***************
*** 38,41 ****
--- 38,43 ----
#endif
+ #include "physfsrwops.h"
+
Uint32 PG_FileArchive::my_instance_count = 0;
PG_SurfaceCache PG_FileArchive::my_cache;
***************
*** 49,53 ****
if(my_instance_count == 1) {
if(PHYSFS_init("paragui") == 0) {
! PG_LogERR("Unable to initialize PhysicsFS !");
return;
}
--- 51,55 ----
if(my_instance_count == 1) {
if(PHYSFS_init("paragui") == 0) {
! std::cerr << "Unable to initialize PhysicsFS !" <<
std::endl;
return;
}
***************
*** 71,75 ****
void PG_FileArchive::Deinit() {
! //PHYSFS_deinit();
}
--- 73,77 ----
void PG_FileArchive::Deinit() {
! PHYSFS_deinit();
}
***************
*** 83,87 ****
--- 85,93 ----
return newpath;
+ #ifdef __MACOS__
+ while( (pos = newpath->find(":", pos)) != std::string::npos) {
+ #else
while( (pos = newpath->find("/", pos)) != std::string::npos) {
+ #endif
newpath->replace(pos, 1, sep);
pos += incr;
***************
*** 113,116 ****
--- 119,139 ----
}
+ PG_FileList PG_FileArchive::EnumerateFiles(const char *dir, const char*
wildcard) {
+ PG_FileList list = EnumerateFiles(dir);
+ PG_FileList result;
+
+ if( list.size() == 0 ) {
+ return result;
+ }
+
+ for( PG_FileList::iterator i = list.begin(); i != list.end(); i++) {
+ if(fnmatch(wildcard, (*i).c_str(), FNM_PATHNAME) == 0) {
+ result.push_back(std::string(*i));
+ }
+ }
+
+ return result;
+ }
+
bool PG_FileArchive::Exists(const char *filename) {
return PHYSFS_exists(filename);
***************
*** 165,168 ****
--- 188,208 ----
}
+ SDL_RWops* PG_FileArchive::OpenFileRWops(const char* filename, PG_OPEN_MODE
mode) {
+ SDL_RWops* file = NULL;
+ switch(mode) {
+ case PG_OPEN_READ:
+ file = PHYSFSRWOPS_openRead(filename);
+ break;
+ case PG_OPEN_WRITE:
+ file = PHYSFSRWOPS_openWrite(filename);
+ break;
+ case PG_OPEN_APPEND:
+ file = PHYSFSRWOPS_openAppend(filename);
+ break;
+ }
+
+ return file;
+ }
+
bool PG_FileArchive::MakeDir(const char* dir) {
return PHYSFS_mkdir(dir) == 1;
***************
*** 238,243 ****
surface = NULL;
! SDL_RWops *rw = PHYSFSRWOPS_openRead(filename);
!
#ifdef HAVE_SDLIMAGE
surface = IMG_Load_RW(rw, 1);
--- 278,288 ----
surface = NULL;
! SDL_RWops *rw = OpenFileRWops(filename);
!
! if(rw == NULL) {
! PG_LogWRN("Unable to open '%s' !", filename);
! return NULL;
! }
!
#ifdef HAVE_SDLIMAGE
surface = IMG_Load_RW(rw, 1);
***************
*** 245,249 ****
surface = SDL_LoadBMP_RW(rw, 1);
#endif
!
if(convert) {
SDL_Surface* tmpsrf = SDL_DisplayFormatAlpha(surface);
--- 290,305 ----
surface = SDL_LoadBMP_RW(rw, 1);
#endif
!
! if(surface == NULL) {
! PG_LogWRN("Failed to load imagedata from '%s' !", filename);
! return NULL;
! }
!
! if(surface == NULL) {
! PG_LogERR("Unable to load imagedata from '%s'", filename);
! PG_LogERR("PhysFS reported: '%s'",
PG_FileArchive::GetLastError());
! PG_LogERR("SDL reported: '%s'", SDL_GetError());
! }
!
if(convert) {
SDL_Surface* tmpsrf = SDL_DisplayFormatAlpha(surface);
***************
*** 284,287 ****
--- 340,368 ----
char** PG_FileArchive::GetSearchPath() {
return PHYSFS_getSearchPath();
+ }
+
+ PG_FileList PG_FileArchive::GetSearchPathList() {
+ char **tempList = PHYSFS_getSearchPath();
+
+ if( tempList == NULL ) {
+ return NULL;
+ }
+
+ PG_FileList retVal;
+
+ // Scan through to get the length of the listing to get the proper
vector size.
+ Uint32 size = 0;
+ for(; tempList[ size ] != NULL; ++size) {}
+
+ // Now we're ready to initialize everything.
+ retVal.reserve( size );
+ for( Uint32 i = 0; i < size; ++i ) {
+ retVal.push_back(std::string(tempList[ i ]));
+ }
+
+ // Clean up.
+ PHYSFS_freeList(tempList);
+
+ return retVal;
}
Index: pgfilelist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilelist.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgfilelist.cpp 29 Apr 2002 11:44:22 -0000 1.1
--- pgfilelist.cpp 18 Aug 2002 08:12:52 -0000 1.2
***************
*** 1,4 ****
--- 1,7 ----
#include "pgfilelist.h"
+ PG_FileList::PG_FileList() {
+ }
+
PG_FileList::PG_FileList(char** list) {
while(*list) {
Index: pglog.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pglog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pglog.cpp 15 Apr 2002 14:53:56 -0000 1.1
--- pglog.cpp 18 Aug 2002 08:12:52 -0000 1.2
***************
*** 27,30 ****
--- 27,35 ----
*/
+ #include "pgapplication.h"
+ #include "pgwindow.h"
+ #include "pgrichedit.h"
+ #include "pglog.h"
+
#include <iostream>
#include <string>
***************
*** 34,45 ****
#include <ctime>
- #include "pgapplication.h"
- #include "pgwindow.h"
- #include "pgrichedit.h"
- #include "pglog.h"
-
Uint32 PG_LogMaxMessages = 200;
int PG_LogMethod = PG_LOGMTH_STDOUT;
static PG_LOG_LEVEL PG_LogLevel = PG_LOG_DBG;
struct PG_LogMessage_t {
--- 39,46 ----
#include <ctime>
Uint32 PG_LogMaxMessages = 200;
int PG_LogMethod = PG_LOGMTH_STDOUT;
static PG_LOG_LEVEL PG_LogLevel = PG_LOG_DBG;
+ static SDLKey PG_LogConsoleKey = SDLK_F12;
struct PG_LogMessage_t {
***************
*** 244,247 ****
--- 245,256 ----
int PG_LogConsole::GetMethod() {
return PG_LogMethod;
+ }
+
+ void PG_LogConsole::SetConsoleKey(SDLKey key) {
+ PG_LogConsoleKey = key;
+ }
+
+ SDLKey PG_LogConsole::GetConsoleKey() {
+ return PG_LogConsoleKey;
}
Index: pgmain.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmain.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgmain.cpp 15 Apr 2002 14:53:56 -0000 1.1
--- pgmain.cpp 18 Aug 2002 08:12:52 -0000 1.2
***************
*** 29,36 ****
#define _GNU_SOURCE
#endif
- #include <cstdlib>
#include "pgapplication.h"
#include "pglog.h"
int PG_main(int argc, char **argv, PG_Application *app)
--- 29,37 ----
#define _GNU_SOURCE
#endif
#include "pgapplication.h"
#include "pglog.h"
+
+ #include <cstdlib>
int PG_main(int argc, char **argv, PG_Application *app)
Index: pgmessageobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmessageobject.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pgmessageobject.cpp 6 May 2002 11:18:03 -0000 1.8
--- pgmessageobject.cpp 18 Aug 2002 08:12:52 -0000 1.9
***************
*** 31,34 ****
--- 31,37 ----
#include "pgapplication.h"
+ #include <iostream>
+ #include <algorithm>
+
// static variables for message processing
PG_MessageObject* PG_MessageObject::captureObject = NULL;
***************
*** 71,75 ****
bool PG_MessageObject::ProcessEvent(const SDL_Event* event) {
SDL_Event e;
!
// check if we are able to process messages
if(!my_canReceiveMessages) {
--- 74,78 ----
bool PG_MessageObject::ProcessEvent(const SDL_Event* event) {
SDL_Event e;
!
// check if we are able to process messages
if(!my_canReceiveMessages) {
Index: pgnavigator.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgnavigator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgnavigator.cpp 16 Apr 2002 07:43:30 -0000 1.2
--- pgnavigator.cpp 18 Aug 2002 08:12:52 -0000 1.3
***************
*** 27,34 ****
*/
#include <algorithm>
#include <cmath>
-
- #include "pgnavigator.h"
PG_Widget* PG_Navigator::my_currentWidget = NULL;
--- 27,34 ----
*/
+ #include "pgnavigator.h"
+
#include <algorithm>
#include <cmath>
PG_Widget* PG_Navigator::my_currentWidget = NULL;
Index: pgrectlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgrectlist.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgrectlist.cpp 29 Apr 2002 11:44:22 -0000 1.2
--- pgrectlist.cpp 18 Aug 2002 08:12:52 -0000 1.3
***************
*** 54,58 ****
testwidget = (*this)[i];
! if(!testwidget->IsVisible()) {
continue;
}
--- 54,58 ----
testwidget = (*this)[i];
! if(!testwidget->IsVisible() || testwidget->IsHidden()) {
continue;
}
***************
*** 78,82 ****
// check if the tested rect is visible
! if(!testrect->IsVisible()) {
continue;
}
--- 78,82 ----
// check if the tested rect is visible
! if(!testrect->IsVisible() || testrect->IsHidden()) {
continue;
}
Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgsurfacecache.cpp 25 Jun 2002 20:38:42 -0000 1.3
--- pgsurfacecache.cpp 18 Aug 2002 08:12:52 -0000 1.4
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 30,33 ****
--- 30,34 ----
#include "pgsurfacecache.h"
#include "pglog.h"
+
#include <iostream>
#include <cstring>
***************
*** 131,135 ****
gradient->colors[i].b
);
!
strcat(tmpkey, colorkey);
}
--- 132,136 ----
gradient->colors[i].b
);
!
strcat(tmpkey, colorkey);
}
--- physfsrwops.c DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/core missing.cpp,1.1,1.2 pgtimerobject.cpp,1.1,1.2 physfsrwops.cpp,1.1,1.2 Makefile.am,1.4,1.5 pgapplication.cpp,1.11,1.12 pgdatacontainer.cpp,1.1,1.2 pgfile.cpp,1.1,1.2 pgfilearchive.cpp,1.5,1.6 pgfilelist.cpp,1.1,1.2 pglog.cpp,1.1,1.2 pgmain.cpp,1.1,1.2 pgmessageobject.cpp,1.8,1.9 pgnavigator.cpp,1.2,1.3 pgrectlist.cpp,1.2,1.3 pgsurfacecache.cpp,1.3,1.4 physfsrwops.c,1.1,NONE,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/physfs/archivers Makefile.am,1.3,1.4 dir.c,1.3,1.4 grp.c,1.3,1.4 zip.c,1.3,1.4 unzip.h,1.1.1.1,NONE
- Next by Date:
[paragui-cvs] CVS: paragui/test stress1.cpp,1.1,1.2 stress2.cpp,1.1,1.2 writefile.cpp,1.1,1.2 .cvsignore,1.2,1.3 Makefile.am,1.9,1.10 animation.cpp,1.3,1.4 dblbuffer.cpp,1.5,1.6 layouttest.cpp,1.2,1.3 list.cpp,1.3,1.4 paratest.cpp,1.12,1.13 pokus.xml,1.3,1.4 windowtest.cpp,1.1.1.1,1.2 autogen.sh,1.1.1.1,NONE
- Previous by thread:
[paragui-cvs] CVS: paragui/src/physfs/archivers Makefile.am,1.3,1.4 dir.c,1.3,1.4 grp.c,1.3,1.4 zip.c,1.3,1.4 unzip.h,1.1.1.1,NONE
- Next by thread:
[paragui-cvs] CVS: paragui/test stress1.cpp,1.1,1.2 stress2.cpp,1.1,1.2 writefile.cpp,1.1,1.2 .cvsignore,1.2,1.3 Makefile.am,1.9,1.10 animation.cpp,1.3,1.4 dblbuffer.cpp,1.5,1.6 layouttest.cpp,1.2,1.3 list.cpp,1.3,1.4 paratest.cpp,1.12,1.13 pokus.xml,1.3,1.4 windowtest.cpp,1.1.1.1,1.2 autogen.sh,1.1.1.1,NONE
- Index(es):