From 3be161f802c28ddf802862b2c2835061ab45601b Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 14 Jan 2011 12:22:12 +0000 Subject: * Removed 'gui' plug-in (support plug-in for 3rd party eAthena GUI front-ends) (topic:262934). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14669 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 + eAthena-6.dsw | 12 --- eAthena-8.sln | 6 -- eAthena-9.sln | 6 -- src/plugins/Makefile.in | 10 +- src/plugins/gui.c | 107 -------------------- src/plugins/gui.def | 6 -- src/plugins/gui.txt | 15 --- vcproj-6/plugin-gui.dsp | 103 ------------------- vcproj-8/plugin-gui.vcproj | 234 -------------------------------------------- vcproj-9/plugin-gui.vcproj | 239 --------------------------------------------- 11 files changed, 3 insertions(+), 737 deletions(-) delete mode 100644 src/plugins/gui.c delete mode 100644 src/plugins/gui.def delete mode 100644 src/plugins/gui.txt delete mode 100644 vcproj-6/plugin-gui.dsp delete mode 100644 vcproj-8/plugin-gui.vcproj delete mode 100644 vcproj-9/plugin-gui.vcproj diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5e92d2267..01de9a3c1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/01/14 + * Removed 'gui' plug-in (support plug-in for 3rd party eAthena GUI front-ends) (topic:262934). [Ai4rei] 2011/01/13 * Fixed mapflags 'restricted', 'nocommand', 'bexp' and 'jexp' still not getting completely initialized upon @reloadscript (bugreport:4710, follow up to r14548). [Ai4rei] * Removed ladmin (remote administration tool), all related support code and the checkversion.pl tool with it's support code, which was shared with ladmin (topic:262934, related bugreport:1147, bugreport:1889, r9408 and r9610). [Ai4rei] diff --git a/eAthena-6.dsw b/eAthena-6.dsw index 6cb2169e0..941ed90bc 100644 --- a/eAthena-6.dsw +++ b/eAthena-6.dsw @@ -87,18 +87,6 @@ Package=<4> ############################################################################### -Project: "gui"=".\vcproj-6\plugin-gui.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "pid"=".\vcproj-6\plugin-pid.dsp" - Package Owner=<4> Package=<5> diff --git a/eAthena-8.sln b/eAthena-8.sln index b06382a1b..9348cc476 100644 --- a/eAthena-8.sln +++ b/eAthena-8.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-8\plugin-console.vcproj", "{73E1101A-310C-4453-8F45-FD2795ABEF15}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-gui", "vcproj-8\plugin-gui.vcproj", "{7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-pid", "vcproj-8\plugin-pid.vcproj", "{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}" EndProject Global @@ -130,10 +128,6 @@ Global {73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.Build.0 = Debug|Win32 {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.ActiveCfg = Release|Win32 {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.Build.0 = Release|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Debug|Win32.Build.0 = Debug|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Release|Win32.ActiveCfg = Release|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Release|Win32.Build.0 = Release|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.ActiveCfg = Debug|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.Build.0 = Debug|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/eAthena-9.sln b/eAthena-9.sln index 555af8e10..7a1f69c67 100644 --- a/eAthena-9.sln +++ b/eAthena-9.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txt-converter-char", "vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-9\plugin-console.vcproj", "{73E1101A-310C-4453-8F45-FD2795ABEF15}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-gui", "vcproj-9\plugin-gui.vcproj", "{7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-pid", "vcproj-9\plugin-pid.vcproj", "{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}" EndProject Global @@ -130,10 +128,6 @@ Global {73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.Build.0 = Debug|Win32 {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.ActiveCfg = Release|Win32 {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.Build.0 = Release|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Debug|Win32.Build.0 = Debug|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Release|Win32.ActiveCfg = Release|Win32 - {7B8997FF-A2B1-4E3C-B6A9-9290F31056DB}.Release|Win32.Build.0 = Release|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.ActiveCfg = Debug|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.Build.0 = Debug|Win32 {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index a16083981..fa74ff90d 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -5,7 +5,7 @@ COMMON_H = ../common/plugin.h ../common/cbasetypes.h \ ../common/showmsg.h ../common/utils.h ../common/strlib.h \ ../common/malloc.h -PLUGINS = sample sig pid gui console +PLUGINS = sample sig pid console @SET_MAKE@ @@ -20,8 +20,6 @@ sig: sig@DLLEXT@ pid: pid@DLLEXT@ -gui: gui@DLLEXT@ - console: console@DLLEXT@ clean: @@ -32,7 +30,6 @@ help: @echo "'sample' - sample plugin" @echo "'sig' - signal handler plugin" @echo "'pid' - process id plugin" - @echo "'gui' - gui plugin" @echo "'console' - console plugin" @echo "'all' - builds all above targets" @echo "'clean' - cleans builds and objects" @@ -43,14 +40,9 @@ help: %@DLLEXT@: %.c @CC@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< -gui@DLLEXT@: ../../plugins/gui.conf - sig@DLLEXT@: sig.c $(COMMON_OBJ) @CC@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ -shared -o ../../plugins/$@ $< $(COMMON_OBJ) -../../plugins/%.conf: %.txt - cp -r $< $@ - # missing common object files ../common/obj_all/%.o: ../common/%.c $(COMMON_H) @$(MAKE) -C ../common txt diff --git a/src/plugins/gui.c b/src/plugins/gui.c deleted file mode 100644 index f45345341..000000000 --- a/src/plugins/gui.c +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder - -#include -#include -#include -#include "../common/plugin.h" -//Needed for strcmpi -#include "../common/mmo.h" - -// "I'm Alive" and "Flush stdout" Originally by Mugendai -// Ported to plugin by Celest - -PLUGIN_INFO = { - "AthenaGUI", - PLUGIN_CORE, - "1.0", - PLUGIN_VERSION, - "Core plugin for Athena GUI functions" -}; - -PLUGIN_EVENTS_TABLE = { - { "gui_init", "Plugin_Init" }, - { NULL, NULL } -}; - -typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr data); -unsigned int (*gettick)(); -int (*add_timer_func_list)(TimerFunc func, char* name); -int (*add_timer_interval)(unsigned int tick, TimerFunc func, int id, intptr data, int interval); - -//----------------------------------------------------- -//I'm Alive Alert -//Used to output 'I'm Alive' every few seconds -//Intended to let frontends know if the app froze -//----------------------------------------------------- -int imalive_timer(int tid, unsigned int tick, int id, intptr data) -{ - printf("I'm Alive\n"); - return 0; -} - -//----------------------------------------------------- -//Flush stdout -//stdout buffer needs flushed to be seen in GUI -//----------------------------------------------------- -int flush_timer(int tid, unsigned int tick, int id, intptr data) -{ - fflush(stdout); - return 0; -} - -void gui_init () -{ - char line[1024], w1[1024], w2[1024]; - int flush_on = 0; - int flush_time = 100; - int imalive_on = 0; - int imalive_time = 30; - char **argv; - int *argc; - FILE *fp; - int i; - - IMPORT_SYMBOL(argc, 2); - IMPORT_SYMBOL(argv, 3); - IMPORT_SYMBOL(gettick, 5); - IMPORT_SYMBOL(add_timer_interval, 8); - IMPORT_SYMBOL(add_timer_func_list, 9); - - do { - fp = fopen("plugins/gui.conf","r"); - if (fp == NULL) - break; - - while(fgets(line, sizeof(line), fp)) - { - if (line[0] == '/' && line[1] == '/') - continue; - if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) == 2) { - if(strcmpi(w1,"imalive_on")==0){ - imalive_on = atoi(w2); - } else if(strcmpi(w1,"imalive_time")==0){ - imalive_time = atoi(w2); - } else if(strcmpi(w1,"flush_on")==0){ - flush_on = atoi(w2); - } else if(strcmpi(w1,"flush_time")==0){ - flush_time = atoi(w2); - } - } - } - fclose(fp); - } while (0); - - for (i = 1; i < *argc ; i++) - if (strcmp(argv[i], "--gui") == 0) - flush_on = imalive_on = 1; - - if (flush_on) { - add_timer_func_list(flush_timer, "flush_timer"); - add_timer_interval(gettick()+1000,flush_timer,0,0,flush_time); - } - if (imalive_on) { - add_timer_func_list(imalive_timer, "imalive_timer"); - add_timer_interval(gettick()+10, imalive_timer,0,0,imalive_time*1000); - } -} diff --git a/src/plugins/gui.def b/src/plugins/gui.def deleted file mode 100644 index 0a5d6a714..000000000 --- a/src/plugins/gui.def +++ /dev/null @@ -1,6 +0,0 @@ -EXPORTS - plugin_info DATA - plugin_event_table DATA - plugin_call_table DATA - - gui_init diff --git a/src/plugins/gui.txt b/src/plugins/gui.txt deleted file mode 100644 index c71b684b6..000000000 --- a/src/plugins/gui.txt +++ /dev/null @@ -1,15 +0,0 @@ -// -// GUI Plugin Configuration -// - -// Enable I'm Alive? -imalive_on: 0 - -// How often to display I'm Alive (in seconds) -imalive_time: 30 - -// Enable GUI flushing for Mugendai's GUI? -flush_on: 0 - -// How often to flush the buffer on-screen (in seconds) -flush_time: 60 diff --git a/vcproj-6/plugin-gui.dsp b/vcproj-6/plugin-gui.dsp deleted file mode 100644 index ec484d85e..000000000 --- a/vcproj-6/plugin-gui.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gui" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=gui - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gui.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gui.mak" CFG="gui - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gui - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "gui - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gui - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release/gui" -# PROP Intermediate_Dir "Release/gui" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GUI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX- /O2 /I "../3rdparty/msinttypes/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /Oicf /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x405 /d "NDEBUG" -# ADD RSC /l 0x417 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/gui.pdb" /machine:I386 /out:"../plugins/gui.dll" - -!ELSEIF "$(CFG)" == "gui - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug/gui" -# PROP Intermediate_Dir "Debug/gui" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GUI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX- /ZI /Od /I "../3rdparty/msinttypes/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /Oicf /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x405 /d "_DEBUG" -# ADD RSC /l 0x417 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib /nologo /dll /pdb:"../plugins/gui.pdb" /debug /machine:I386 /out:"../plugins/gui.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "gui - Win32 Release" -# Name "gui - Win32 Debug" -# Begin Source File - -SOURCE=..\src\plugins\gui.c -# End Source File -# Begin Source File - -SOURCE=..\src\plugins\gui.def -# End Source File -# End Target -# End Project diff --git a/vcproj-8/plugin-gui.vcproj b/vcproj-8/plugin-gui.vcproj deleted file mode 100644 index 9bf4cc40d..000000000 --- a/vcproj-8/plugin-gui.vcproj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcproj-9/plugin-gui.vcproj b/vcproj-9/plugin-gui.vcproj deleted file mode 100644 index dda42a8b4..000000000 --- a/vcproj-9/plugin-gui.vcproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-60-g2f50