aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2011-11-01Fallback to loading of system-wide init file if loading of user's failsPavel Labath1-13/+15
2011-11-01Convert slitlist from a separate file to a regular lua resourcePavel Labath5-78/+96
2011-11-01Fix saving of resources.Pavel Labath1-29/+66
2011-11-01Remove an unused variablePavel Labath1-1/+0
2011-11-01Make session.screenX.workspace_names a real FbTk::ResourcePavel Labath3-102/+27
instead of the add-on hack it was. This also fixes a lot of problems with saving of config.
2011-11-01Vector resources can now specify which char to use as delimitersPavel Labath2-3/+4
when saving/loading to/from string representation. This is needed for the next commit.
2011-11-01Add LocaleStringTraits resource classPavel Labath1-2/+19
for resources which need to work with localised strings.
2011-11-01Replace ResourceManager with the lua versionPavel Labath13-144/+99
Loading of an init file with the new manager works ok. Saving and restarting is still not completed. This touches many files because i removed the alternative name of resources. Unlike Xrm, lua does not have native support for alt names. It should be fairly easy to add them, but I think that is unnecessary and would be confusing.
2011-11-01Fix bug in LResources: they were unable to handle resources with numbers in ↵Pavel Labath1-6/+6
names
2011-11-01Another temporary commitPavel Labath1-6/+6
- comment out automatic upgrading of init file as we don't have that yet and it was causing problems - rename default init file to ~/.fluxbox/init2 to reflect the change of syntax - comment out exception handling blocks in main(): it is easier to debug when the program terminates when an unhandled exception occurs
2011-11-01Make lua resource manager automatically initialize lua state if neededPavel Labath1-0/+5
2011-11-01Add a function for converting from XResources to lua onesPavel Labath3-0/+21
2011-11-01Lua resources: Add support for saving of boolean valuesPavel Labath1-6/+15
2011-11-01Factor out "session." from resource namesPavel Labath6-36/+42
this reduces typing and it makes more sense in lua, since there the resources are implemented as hierarchical tables and the topmost table has to be handled a bit specially.
2011-11-01Move more common stuff of (L)ResourceManagers to their base classPavel Labath4-80/+41
2011-11-01Avoid a "converting to int from foo" compiler warningPavel Labath1-1/+1
2011-11-01Add support for array lua resourcesPavel Labath3-34/+49
2011-11-01Simplify FbTk::Resource template classPavel Labath21-856/+428
by outsourcing the conversion from string/lua to the specific type (and back) to a separate class. This change touches a lot of files because the interface of FbTk::Resource changed slightly. However, the changes are minor.
2011-11-01Specializations of FbTk::Resource<X>::{setFromLua,pushToLua}Pavel Labath7-40/+346
for various values of X.
2011-11-01A rough version of resource implementation in luaPavel Labath6-35/+443
I added a new class, LResourceManager, which should handle loading and saving of resources like the old ResourceManager, only it does that with the help of lua. I moved the common features of the two managers (interface + a few functions) to a common base class ResourceManager_base. I augmented the Resource_base class with two new functions (setFromLua and pushToLua) which are used by the lua RM instead of getString and setFromString. Parts of the new RM are written in lua. To avoid loading scripts from a file at runtime I decided to link compiled lua code straight into the executable. For this purpose I created a small script which converts a binary file into a declaration of a C array of bytes.
2011-11-01convert ResourceManager::{add,remove}Resource from template to a regular ↵Pavel Labath2-34/+31
function
2011-11-01Lua exceptions can now outlive thier lua contextPavel Labath2-5/+18
2011-11-01Luamm: add lua_createtable bindingPavel Labath1-0/+1
2011-11-01luamm: add a version of loadstring which also takes the string length as a ↵Pavel Labath2-3/+22
parameter
2011-11-01Add lua_rawgeti wrapper to luammPavel Labath1-0/+1
2011-11-01Remove the possibility to transport exceptions through lua codePavel Labath2-54/+9
It's impossible to do this without C++0x features (we need std::exception_ptr).
2011-11-01c++ lua binding: get rid of variadic templatesPavel Labath1-5/+44
See how variadic templates are good. They enabled me to write those four functions as one.
2011-11-01c++ lua binding: get rid of shared_ptrPavel Labath2-102/+108
It was pretty underused anyway. I was just lazy to write a proper destructor.
2011-11-01c++ lua binding: get rid of deleted functions and rvalue referencesPavel Labath2-48/+25
2011-11-01c++ lua binding: replace std::function with FbTk::SlotPavel Labath2-24/+36
std::function is superior, but not supported on old compilers
2011-11-01C++ binding for luaPavel Labath3-0/+810
copied from conky (http://conky.sf.net) and relicensed. Since I am the person who wrote it in the first place there should not be a problem with licence conversion.
2011-11-01Integrate the lua build system into oursPavel Labath2-1/+3
2011-10-31src/Makefile.am,FbTk/StringUtil.cc: Search relative to the executable.Ryan Pavlik2-7/+78
On Windows, prepend /DUMMYPREFIX to default paths, and replace it at runtime with the prefix relative to the exe directory.
2011-10-31FbTk/StringUtil.cc: Don't return mid-routine.Ryan Pavlik1-2/+3
Prep for Windows dummy prefix code.
2011-10-31main.cc,FbTk/StringUtil.cc: On windows, use USERPROFILE instead of HOMERyan Pavlik2-1/+8
2011-10-31FbTk/FbString.cc,Font.cc: Windows doesn't have nl_langinfoRyan Pavlik2-4/+4
2011-10-31FbCommands.cc: Implement ExecuteCmd for WindowsRyan Pavlik1-5/+17
2011-10-31main.cc: Add a wrapper for two-argument mkdir on WindowsRyan Pavlik1-0/+8
2011-10-31fluxbox.cc: ifdef the signals windows doesn't have.Ryan Pavlik1-1/+8
2011-10-31FbTk/Timer.cc: Check HAVE_SYS_SELECT_H, add alternate for windowsRyan Pavlik1-0/+2
2011-10-31Merge branches 'fix-out-of-range-memory', 'obey-configure' and ↵Ryan Pavlik9-20/+48
'other-improvements' into windows-mingw
2011-10-31FbTk/App.cc: make startup failure easier to diagnoseRyan Pavlik1-2/+7
2011-10-31main.cc: Use expandFilename for default pathsRyan Pavlik1-6/+7
2011-10-31src/Makefile.am: Add warning to defaults.cc as wellRyan Pavlik1-0/+1
2011-10-31main.cc: Check getenv output better.Ryan Pavlik1-2/+2
Windows returns pointers to empty strings for non-existent env vars.
2011-10-31FbTk/FileUtil.cc: Use only file masks defined.Ryan Pavlik1-3/+8
Needed for mingw-cross-env
2011-10-31FbTk/SignalHandler.cc: Use HAVE_SIGACTION, with signal() fallbackRyan Pavlik1-1/+7
This fixes platforms without sigaction, like Windows.
2011-10-31FbTk/Timer.cc: Check HAVE_SYS_SELECT_HRyan Pavlik1-1/+3
2011-10-31FbTk/StringUtil.cc: Fix out-of-range memory access.Ryan Pavlik1-1/+1
if pos is not npos, it will always be less than filename.size(). However, the access later is only safe if there is a character after pos, which would require pos + 1 to be less than filename.size.
2011-10-31RootTheme.cc: Obey HAVE_SYS_WAIT_HRyan Pavlik1-0/+3