aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2011-06-25Fallback to loading of system-wide init file if loading of user's failsPavel Labath1-13/+15
2011-06-20Convert slitlist from a separate file to a regular lua resourcePavel Labath5-78/+96
2011-06-19Fix saving of resources.Pavel Labath1-29/+66
2011-06-17Remove an unused variablePavel Labath1-1/+0
2011-06-16Make 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-06-16Vector 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-06-16Add LocaleStringTraits resource classPavel Labath1-2/+19
for resources which need to work with localised strings.
2011-06-16Replace 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-06-16Fix bug in LResources: they were unable to handle resources with numbers in ↵Pavel Labath1-6/+6
names
2011-06-16Another 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-06-15Make lua resource manager automatically initialize lua state if neededPavel Labath1-0/+5
2011-06-15Add a function for converting from XResources to lua onesPavel Labath3-0/+21
2011-06-15Lua resources: Add support for saving of boolean valuesPavel Labath1-6/+15
2011-06-15Factor out "session." from resource namesPavel Labath6-38/+45
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-06-15Move more common stuff of (L)ResourceManagers to their base classPavel Labath4-80/+41
2011-06-15Avoid a "converting to int from foo" compiler warningPavel Labath1-1/+1
2011-06-15Add support for array lua resourcesPavel Labath3-37/+53
2011-06-15temporary commit for testing lua resource managerPavel Labath1-0/+13
2011-06-15Simplify 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-06-15Specializations of FbTk::Resource<X>::{setFromLua,pushToLua}Pavel Labath7-40/+346
for various values of X.
2011-06-15A 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-06-15convert ResourceManager::{add,remove}Resource from template to a regular ↵Pavel Labath2-34/+31
function
2011-06-15Lua exceptions can now outlive thier lua contextPavel Labath2-5/+18
2011-06-15Luamm: add lua_createtable bindingPavel Labath1-0/+1
2011-06-15luamm: add a version of loadstring which also takes the string length as a ↵Pavel Labath2-3/+22
parameter
2011-06-15Add lua_rawgeti wrapper to luammPavel Labath1-0/+1
2011-06-15Remove 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-06-15c++ 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-06-15c++ 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-06-15c++ lua binding: get rid of deleted functions and rvalue referencesPavel Labath2-48/+25
2011-06-15c++ lua binding: replace std::function with FbTk::SlotPavel Labath2-24/+36
std::function is superior, but not supported on old compilers
2011-06-15Prepare the Slot classes to be used as lua callbacksPavel Labath2-64/+117
Added some polish around them and, to mark this special occasion, moved them out of the SigImpl namespace. PS: This partially reverts commit 0775350fee345e37fb59835dda4d85664346b606, since I had to reintroduce ReturnType template parameter, because it will be used in lua. But Signal classes remain without the ReturnType, because I still cannot imagine how would it be used.
2011-06-15C++ 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-06-15Integrate the lua build system into oursPavel Labath2-1/+3
2011-06-15Add template copy constructor to FbTk::RefcountPavel Labath1-2/+8
and remove a an "almost" copy constructor (almost, because it takes a non-const reference parameter) which was useless.
2011-05-16TextDialog now handles parentrelative labelsnacitar sevaht1-11/+20
Prior to this patch, TextDialog did not handle parentrelative labels; borrowing code from OSDWindow, now TextDialog properly handles this. Eventually, I plan to combine the good parts of TextDialog and OSDWindow into OSDWindow, and then let TextDialog derive from OSDWindow... but for now, here's the band-aid fix for the issue without the refactorization.
2011-05-16TextDialog and ToolTipWindow style rendering bugs fixednacitar sevaht2-11/+17
TextDialog windows (such as 'set title', or 'edit clock format') now properly render their titlebar to match the current style. Previously, the titlebar font settings were controlled by window.font.*, and this became apparent because window.font.effect needed to be set to put 'halo' on the titlebar of these TextDialogs. However, window.font.effect controls the effect on the text within the editbox on these as well, having these set in the same location is far from desirable. Specifically because the TextDialog essentially emulates the titlebar of other windows. So, after this change, window.font.effect still controls the text in the editbox, but the titlebar area is themed as the titlebars of other windows. Text justification of titlebar and border width, is now respected in TextDialog. Also, previously the edit box was sized in an odd way; one which left part of the window actually undrawn (so you'd get artifacts from whatever happened to be on the screen in that position when it opened); this has been addressed. TextDialogs, rather than going to the center of the entire desktop, now center on the _current head_, which prevents the awful positioning where half of the window is on one screen and half is on another. Lastly, when hovering your mouse over the iconbar button for a window with a title that's too wide to fit on the button, a tooltip is displayed. This tooltip themes itself to match the button, however it wasn't using the theme properly (similarly to how TextDialog was)... and as such, also wasn't using the proper font effects. This has been addressed just as it was for the TextDialog.
2011-05-10Make SignalTracker always disconnect itself from SignalsPavel Labath1-4/+3
previously, the tracker disconnected itself only when the caller passed withTracker = true to the leave() function. However, the default value was for the parameter was false. Non disconnecting from signal when stopping tracking creates very dangerous situation because the signal still holds a pointer to the tracker. This resulted in a segfault when exiting fluxbox, because the tracker (FluxboxWindow) got destroyed before the signal (BScreen::focusedWindowSig), and the signal was using an invalid pointer when it tried to disconnect itself from the tracker. Instead of setting withTracker to true by default or changing all invocations of leave(), I decided to make the tracker disconnect itself unconditionally because I could not find a use case for the opposite behaviour. PS: This message is in fact longer than the actual commit.
2011-05-10Remove all trace of Observers and SubjectsPavel Labath15-359/+2
this marks the completion of the transition to FbTk::Signal
2011-05-10Convert ToolbarItem::resizeSig to FbTk::SignalPavel Labath6-19/+11
2011-05-10Convert Screen::reconfigureSig to FbTk::SignalPavel Labath5-29/+10
2011-05-10Convert Focusable::attentionSig to FbTk::SignalPavel Labath4-47/+10
2011-05-10Convert FbWinFrame::frameExtentSig to FbTk::SignalPavel Labath4-23/+13
Also, I spotted a potential bug in the code. I marked the place with XXX. Someone should take a look at that.
2011-05-10Convert FluxboxWindow::hintSig to FbTk::SignalPavel Labath2-6/+3
2011-05-10Convert FluxboxWindow::layerSig to FbTk::SignalPavel Labath6-86/+34
2011-05-10Convert FluxboxWindow::stateSig to FbTk::SignalPavel Labath8-59/+56
2011-05-10Remove Observers from testSignal.ccPavel Labath1-23/+0
2011-05-10Convert FluxboxWindow::workspaceSig to FbTk::SignalPavel Labath6-27/+40
2011-05-10Convert Focusable::orderSig,addSig,removeSig,resetSig to FbTk::SignalPavel Labath4-79/+72
2011-05-10Added FbTk::MemFunBind - a functor which binds all arguments of a functionPavel Labath1-0/+94