From 65d8bdf0ce7a27c822a8ca6c7f287dc39e29b0b7 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 11 Aug 2007 23:42:40 +0000 Subject: migrate patches from trunk --- BUGS | 13 +- COPYING | 2 +- Doxyfile | 2 +- NEWS | 171 ++++++------------ README | 17 +- RoadMap | 216 +---------------------- TODO | 28 --- configure.in | 2 +- data/Makefile.am | 2 +- data/README | 17 -- data/README.menu | 372 --------------------------------------- data/README.style | 330 ---------------------------------- doc/fluxbox.1.in | 42 +---- nls/sv_SE/Translation.m | 111 ++++++++++++ nls/sv_SE/generated-ISO-8859-1.m | 111 ++++++++++++ nls/sv_SE/generated-UTF-8.m | 111 ++++++++++++ src/Window.cc | 4 +- src/main.cc | 2 +- 18 files changed, 407 insertions(+), 1146 deletions(-) delete mode 100644 data/README delete mode 100644 data/README.menu delete mode 100644 data/README.style diff --git a/BUGS b/BUGS index 0e8a722..307abe6 100644 --- a/BUGS +++ b/BUGS @@ -2,19 +2,8 @@ Known bugs and missing features that will be fixed in future version: BUGS: - * Reported issues with gvim windows that have different sized fonts. - -> Tabbing them together makes them fight over the window size, and - thus shrink to minimum - - * Some builds/distros seem to require all supported locales to be - installed to build properly (e.g. mdk, gentoo reported), this ok? - -Other TODO: - -FAQ items for: - * "My window (e.g. mplayer/xmms) stops updating with non-opaque window moving. - - outline moving does this, it's not a bug, etc etc. + - Current implementation of outline moving does this, it's not a bug. diff --git a/COPYING b/COPYING index 696c346..eb0115c 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2001-2005 Henrik Kinnunen (fluxgen@fluxbox.org) +Copyright (c) 2001-2007 Henrik Kinnunen (fluxgen@fluxbox.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/Doxyfile b/Doxyfile index e629add..af0a64a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = fluxbox # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.9.14 +PROJECT_NUMBER = 1.0.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/NEWS b/NEWS index c74a1b2..a900b0e 100644 --- a/NEWS +++ b/NEWS @@ -1,124 +1,57 @@ -News in 1.0rc3: - * Introduced support for mouse buttons in the keys file - - Mouse buttons are bound to new `keys' Mouse1, Mouse2, etc. - - Also a new modifier `OnDesktop' to specify actions that should take place - when you click on the desktop -- without this, mouse bindings are global - * Added a utility to the project that automatically updates configuration - files when we change the syntax -- your current mouse bindings on the - desktop will be added to your keys file automatically - * Introduced new key command: HideMenus - * Introduced a key command to display a menu stored in an arbitrary file: - CustomMenu /path/to/file - * More extended wm hints support: - * _NET_WM_MOVERESIZE_CANCEL (new in version 1.4.draft-1), - * _NET_REQUEST_FRAME_EXTENTS - * _NET_WM_WINDOW_TYPE_MENU - * _NET_WM_WINDOW_TYPE_TOOLBAR - * Little simplification of data structure for keybindings (Mark) - Side effects: - - "Mod4 a b" now behaves like "Mod4 a None b" -- in fact, "None" is now - completely obsolete - - You can press "Escape" to cancel any Emacs-style keychain in progress - (unless it's bound to something else) - - If there is a conflict between bindings, the first one in the file wins - - Fixes handling of keychains like "Mod4 a Mod1 b" - - Should fix some issues with "None" modifier - * Updated following translations: - pt_PT, es_ES, es_AR, pt_BR, de_DE, nb_NO - * Support per-window transparency settings. - ( sf.net patch #1511042, feature #1108692 ) - - new "Transparency" menu in the window menu - - new apps file attribute: - [alpha] {int int} (or just {int}) - Where numbers represent focused and unfocused transparency, - respectively. One number only will be used for both. - - Also, show toggle status for shade and stick in window menu. - * Introduced new key command: SetAlpha [[+-] [[+-]]] - - with no arguments, returns the focused window to default settings - - with one argument, changes both focused and unfocused settings the same - way - - with two arguments, the first changes the focused alpha, and the second - changes the unfocused alpha - E.g. SetAlpha 127 +5 will set the focused alpha to 127 and increment the - unfocused alpha by 5 (until it reaches 255) - - * Added resource and menu item for maximizing over external tabs - * Renamed session.screen*.iconbar.deiconifyMode to - session.screen*.userFollowModel (Mark) - This resource is used for: - - clicking a window on a different workspace in the iconbar - - _NET_ACTIVE_WINDOW messages where the source is a pager - - clicking a client in the workspace menu (and the opposite is used for - right clicks) - Possible values are: - - Follow: go to the workspace of the selected window - - Current: bring the window to the current workspace - - SemiFollow: act like Current for iconified windows, else Follow - - Ignore: leave it alone - * Added support for negative arguments to the `Tab' key command to count - backwards from the last tab in the group - * Added option to :Minimize key command to lower all windows in the same - layer as the focused window,syntax is :Minimize (layer) - * Several changes for background style option: - - now support `background: mod' to coincide with fbsetroot -mod -- - In addition to `background.color' and `background.colorTo', this option - must also set `background.modX' and `background.modY' to integers - - added `background: none' for styles that do not include a background - - fixed bug with style backgrounds not getting set when changing styles - - updated default styles to be valid wrt background options - * Made some changes to the way autogrouping in the apps file works - - Introduced new syntax [group] (workspace) to group new windows only with - windows on the current workspace. - * XEMBED support for systemtray. - * Added typeahead support to menus (patch by Philipp Goedl, modified by Mark - and Matteo Galiazzo) - - Added new style item menu.frame.underlineColor: for displaying - matching items - * session.screen.defaultDeco now allows same strings as apps file +News in 1.0: + * Fixed shape handling, now shaped corners have border. + * Allow negative numbers in command "Workspace" + * Added utility fluxbox-remote + * Allows script access to most fluxbox commands; + Support must be turned on in the init file with + session.screen.allowRemoteActions; the syntax is, e.g., + fluxbox-remote "CustomMenu ~/.fluxbox/custommenu" + * Added keycommands :AddWorkspace and :RemoveLastWorkspace + * Added some missing Open Office entries and window managers, + plus some other minor changes in fluxbox-generate_menu + * Updated languages: + sv_SE, zh_CN, de_*, es_ES, es_AR, en_US, en_GB, pt_* + fi_FI, fr_FR Bug fixes: - * #1437864, Buttons should only run a command if the mouse was clicked down - on the same button - * #1560803, MaxSize and MinSize hints weren't getting updated properly - * #1535304, #1572683, #1646740, Layer wasn't set properly on remembered - windows, and the layer menu wasn't getting updated properly, - * #1060891, #1517747, Clicking on the edge of a button didn't work - * #1595497, Don't escape regular expression metacharacters in apps file - * #1621980, Fix data type of data passed to set _NET_FRAME_EXTENTS - * #1528646, Don't add 2 pixels to a specified toolbar height - * #1595336, Stop cycling focus when any other command is run - * #1561482, Crash when clicking on the workspacename to get the - toolbar menu. - * #1362913, core dumps on Solaris - * #1519913, Next/PrevWindow toolbar buttons break MouseFocus - * #1491571, Round corners badly rendered - * #1449608, Auto-grouped windows using groups file didn't raise - * #1069909, Incorrect window dimensions - * Changing between internal and external tabs didn't affect iconified - windows - * Preserve order of focused windows on restart - * Properly revert focus when two windows close simultaneously - * Fixed nls digit strings to prefix with zero "%4d" => "%04d" for proper - spacing - * Fix RefCount crash and Slit deconstruction ordering - * Detect user's shell from environment rather than assuming /bin/sh - * Fixed an unreported bug with grouping windows on multiple screens - * Fixed a bug with resizing windows for clients when only the width is - specified - * Fixed a bug with `session.ignoreBorder: true' - * Slit was creating a strut even when it wasn't visible - * Fixed display bug with ParentRelative menu highlight - ...and more, not listed here. + * #1694959 Rotate toolbar background texture along with toolbar + * #1712583 Non-latin characters displayed incorrectly in menu title + * #1708859 Fix error passing --with-locale path in ./configure + * #1524098 #1633718, System tray restart issue + ( gaim/pidgin crash on restart ) + * #1748967 Save workspace names when changing through menu + * #1745678 Fixed resource usage due to Skype 1.4 + * #1736252 Strip off additional bits in event state set by Xorg + * #1716899 Deiconify when automatically tabbing to a minimized + window with focus new windows on + * #1479517 Fix submenu placement with xinerama after moving the + menu between heads + * #1716900 Also send transient windows when sending a window to + another workspace + * #1717782 Bad fullscreen in ooimpress2 + * #1718112 memory leak in FbWindow::textProperty + * #1545066 Only replace numbers with zeros when calculating clock + width + * #1652185 Fix window menu context when opened by clicking on tab + * Workspace Menu wasn't updating when windows changed titles + * HideMenus didn't work on CustomMenus, and also fixed a memleak with + CustomMenu + * Fix to avoid rogue instances of /bin/sh after forking away programs + * Fixed some rendering problems when toolbar item borderwidth is + too large and toolbar bevelwidth is set + * Right clicking on a submenu didn't revert focus to its parent + * Pressing escape in a torn menu didn't work + * Updates for compiling with gcc 4.3 + * Fixed compile error with --disable-remember + * Fix transient windows getting tabbed from apps file and not + changing layers when main window is in a lowered tab + * Fixed some window placement issues + * Fixed bug with fluxbox-generate_menu -is + * Fixed infinite loop caused by deiconify command + * Fixed a bug in parsing cli + * Fix slit.onhead with BOTTOMLEFT placement + * Fixed crash when CustomMenu command doesn't point to a file -See ChangeLog for more details. - -This is the final release candidate. -Next relase will be 1.0.0 stable. - -We need people to report bugs and other issues so we can make next -release the most stable release ever. - -Do not forget to include language setting, OS and distribution -when reporting bugs. + See ChangeLog for more details. diff --git a/README b/README index b0d76c6..83deced 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is a development version of Fluxbox. +This is a stable version of Fluxbox. Fluxbox is a fork of the original Blackbox 0.61.1 sourcecode with different goals. @@ -20,16 +20,15 @@ Compile and Install: Configuration options: - For KDE slitsupport (default): (Allows kde tray icons to be placed in systray inside the toolbar) +For KDE slitsupport (default, does not require any kde libraries): +( Allows kde tray icons to be placed in systray inside the toolbar ) ./configure --enable-kde - For Gnome support (default): + For Gnome support ( default, does not require any gnome libraries ): ./configure --enable-gnome Use ./configure --help to see the full list of options - - For former blackbox users: - You can use your old blackbox configuration file too. Just copy @@ -66,15 +65,13 @@ Thanks: Blackbox team - aleczapka, skarin, Perc, xfs, skypher and skywarper for bugtesting. + People at #fluxbox on the irc.freenode.net irc-network. skypher of openprojects for bugtesting and providing fluxbox with themes: Clean CleanColor Makro, Carbondioxide and MerleyKay. - People at #fluxbox on the irc.freenode.net irc-network. - And all the people who sent bugfixes/patches. + And all the people who sent bugfixes/patches and helped us making + Fluxbox a better application. -This software is OSI Certified Open Source Software. -OSI Certified is a certification mark of the Open Source Initiative. diff --git a/RoadMap b/RoadMap index 9408081..cf3f3f3 100644 --- a/RoadMap +++ b/RoadMap @@ -1,215 +1 @@ -This file is intended to provide a rough roadmap of the development -towards the Fluxbox 1.0.0 release. - -The process will involve a number of development releases in the 0.9 -series until features and execution (i.e. bugs) stabilise. - -Some of the interesting new features beyond 0.1.14 that we'd like to work towards are: - -- Layer Support -- New action system (key/mouse bindings) -- Tabgroup rewrite (should also allow more commands to act on the whole group) -- Tabs embedded in titlebar -- Most recently used window cycling -- Toolbar modes -- Integration of remember patch (or at least the concept) -- Smarter config menus (ability to modify numeric values) -- fix Xinerama support again -- XRandr support - -Some minor ones (mainly bugfixes or small things) that I feel like noting are -(many of these based on feature requests or bug reports from sourceforge): - -- Key bindings for: - -> restart - -> specific tab numbers - -> tabgroup keybindings - -> menu navigation - -> moving windows to next workspace/tabgroup -- fix up focus issues (click to focus sometimes acts like sloppy) -- proper initialisation from hints (e.g. Eterm -D 2) -- fix toggledecoration to not give tabs back etc -- snap to windows -- Pixmap buttons -- Shaped menus/toolbar/slit -- improved command line output for help option (plus include compile-time options - etc in output for improved bug reporting) -- layer configuration things for toolbar/slit/numlayers -- fix outline window moving - -Some lower priority ones ("thoughts"/maybes): - -- transparency (major) -- keybindings for directional focus moving: - -> nextWindowLeft/Right/Up/Down - - looks for the window left of the current one, and gives it focus -- more powerful autogrouping matching -- stop window movement by clicking on border (only on frame instead) -- mouse button "keys" -- ability to specify keybinding actions for titlebar buttons (i.e. configurable actions for titlebar buttons). - -Notes: - - (optional) Unique per-workspace backgrounds - => To be made into separate application, if time permits will try to - get this done before 1.0.0rc1 - -Known Bugs (to be looked at at some time): - - Focus acts sloppy on window close/warp, or when decoration-less window is "focused" - -Fixed known bugs: - - Doesn't redraw properly after unshade - ----------------------------------------------------------- - -So, what's the plan? - -Key: -- => Planned (or not applicable) -= => Started -+ => Almost done -* => Done - ----------------------------------------------------------- -Release: 0.9.0 -Approx Date: 23 February, 2003 -Major Features: - * Layer support (Simon) - * New action system (Henrik) - * Smarter config menus (Henrik) -Minor Features: - * Proper initialisation from hints (Simon) - * layer configuration things (Simon) -Bugfixes/lower priority: - ----------------------------------------------------------- -Release: 0.9.1 -Approx Date: 7 April, 2003 -Major Features: - * Toolbar modes (Simon) - * Tabs embedded in titlebar (Henrik) - * Tabgroup rewrite (Henrik) - * Most recently used window cycling (Simon) -Minor Features: - * fix outline window moving (Simon) -Bugfixes/lower priority: - * Bugs from 0.9.0 (Both) - * Doesn't redraw properly after unshade (Simon) - ----------------------------------------------------------- -Release: 0.9.2 -Approx Date: 5 May, 2003 -Major Features: - * Integration of Remember patch (Simon) - * Transparency (Henrik) -Minor Features: - * more keybinding actions (Both) - * directional focus movement (Simon) - * fix up focus issues (Simon) - * snap to windows (Simon) - * improved command-line help option (Henrik) - * pixmap buttons (Henrik) -Bugfixes/lower priority: - * Bugs from 0.9.1 (Both) - * stop window moving from borders (Simon) - * Focus acts sloppy on window close/warp (Simon) - ----------------------------------------------------------- -Release: 0.9.3 -Approx Date: 5 June, 2003 -Major Features: - * Xinerama (Simon) - * XRandr (Henrik) -Bugfixes/lower priority: - * Fix nasty crash bug from 0.9.2 (Henrik) - + Other bugs from 0.9.2 and previous (Both) -Notes: - Intended as a stabler, fairly usable devel release - after the crashing of 0.9.2 - ----------------------------------------------------------- -Release: 0.9.4 -Approx Date: 7 July, 2003 -Key Features: - * Regular expression support in remember - on several attributes (Simon) - * Save grouping so it persists over restart (Simon) - * Autogrouping functionality into remember (Simon) - (this will thus get regexp matching etc) - * Shaped menu/slit/toolbar (Henrik) - * Improved screen object placement (Henrik) - (will fix Maximize over slit/toolbar) -Other Minor Features: - * Add some sort of program launch function (Simon) -Bugfixes/lower priority: - * Titlebar sometimes doesn't redraw properly - * Fixes for 0.9.3 and previous (Both) - ----------------------------------------------------------- - -... - ----------------------------------------------------------- -Release: 0.9.? (remaining) -Approx Date: ? -Major Features: - - Mouse actions as keys (so you can, e.g. Mod1 Button1 :ResizeWindow) (?) - - nls code - layers, remember, new stuff... (Both) - - Update Translations - - C - - bg_BG - - da_DK - - de_DE - - en_AU - - es_ES - - et_EE - - fr_FR - - it_IT - - ja_JA - - lv_LV - - pt_BR - - pt_PT - - ru_RU - - sv_SE - - tr_TR - - more??? - - Update Documentation - - man page - - web docs - - FAQ -Minor Features: - - Transparent titlebars + toolbar -Bugfixes: - - As many of those little niggly things as possible (some of which may be - non-trivial to fix). - -Other: - - app (fbev?) for per workspace backgrounds, among other things - - should do some profiling and optimisation - ----------------------------------------------------------- -Release: 1.0.0rc1 -Approx Date: ? - - - Bug Fixes & tweaks. Nothing major. - -This release is aiming to be a very close approximation for 1.0.0. -There is a fair amount of cooling time before the full release to allow -for an rc2 or more if necessary, but we'd really like to iron out all -those little bugs that are remaining around here. - ----------------------------------------------------------- -Release: 1.0.0 -Approx Date: ? - - - Obviously any remaining bug-fixes and small tweaks. - - Translations. - - Documentation. - - -The dates for later releases of the development branch are not estimated -because they are difficult to estimate. New features add new bugs. There -are always little things being added. The developers are also constantly -interrupted by "real life" events. - -However, we really do want to get 1.0.0 released. So don't despair. It's coming. - +This file is intended to provide a rough roadmap of the development. diff --git a/TODO b/TODO index 4c7bb6a..a8edc7d 100644 --- a/TODO +++ b/TODO @@ -1,34 +1,6 @@ --------- Code: -* Check FluxboxWindow::toggleDecor - Needs cleaning and check functions that uses this one. Should function - struct really be affected by this function. -* Fix some kind of "global" double click interval. see IntResMenuItem.cc --------- Features: -* you type a key and then you have a little menu which lets you - choose a window to group with the one where you are -* Finnish (Finland) translation -* "Iconify group"/group commands in Windowmenu -* Call and navigate menus from the keyboard (bind a menu to a key - and use arrows to navigate) -* Dynamic tag width. Currently I know of two options - constant width - and dividing the full window width. I like it better when the width is - enough to show all the title, as long as the aggregation of all tabs - doesn't exceed the frame's width (see PWM for example) -* Unique names (e.g, the second xterm title will be "xterm <2>", as in - emacs), needed for the next wish: -* "Goto Frame" as Emacs C-x b, that show completions in the bar -* mouse button configure -* better group handling - possibly a structure to hold information about a - tabgroup, so you can set a win property with a unique identifier and - ordering, so that groups can be reconstructed on restart, and also set - on launch somehow. Possibly related would be fixing it so it remembers - which member of a tabgroup is the focused one, and set that - appropriately when necessary (eg currently, unsticking a group will - revert the focus to the "first" window in the group, instead of the - focused one). - - Next Generation: diff --git a/configure.in b/configure.in index d51541f..92a413b 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Initialize autoconf and automake AC_INIT(src/main.cc) AC_PREREQ(2.52) -AM_INIT_AUTOMAKE(fluxbox,1.0rc3, no-define) +AM_INIT_AUTOMAKE(fluxbox,svn, no-define) dnl Determine default prefix test x$prefix = "xNONE" && prefix="$ac_default_prefix" diff --git a/data/Makefile.am b/data/Makefile.am index 18a05cc..ec35423 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS= styles CLEANFILES= menu menu.in menu.pre menu.bak init MAINTAINERCLEANFILES= Makefile.in pkgdata_DATA= keys menu init -EXTRA_DIST= keys init.in README.style README.menu README +EXTRA_DIST= keys init.in all-local: menu init install-pkgdataDATA: @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" diff --git a/data/README b/data/README deleted file mode 100644 index 63844b4..0000000 --- a/data/README +++ /dev/null @@ -1,17 +0,0 @@ --- data/README for Blackbox 0.61.x - an X11 Window manager - -The data/ directory holds some menu and style (or theme) examples for Blackbox. -These are installed as system defaults, and are ALWAYS overwritten when -upgrading or otherwise re-installing Blackbox. Changes to them are -discouraged, because of this reason. - -In the data/ directory, you will find a file named `menu' and a directory -named `styles.' These are the system defaults that are installed when -Blackbox is built, and they are intended as examples on how to customize and -control the appearance of Blackbox. In the event that a user does not have -a defined menu and/or style, Blackbox falls back on the example menu and/or -styles included here. - -For information on creating/editing a menu, see the file README.menu. - -For information on creating/editing a style, see the file README.style. diff --git a/data/README.menu b/data/README.menu deleted file mode 100644 index ecee95f..0000000 --- a/data/README.menu +++ /dev/null @@ -1,372 +0,0 @@ --- data/README.menu for Blackbox 0.61.x - an X11 Window manager - -Creating a user defined menu: ------------------------------ -Creating a menu for Blackbox requires a text editor of some sort. Familiarity -with your choice of text editor is assumed, since editor preference differs -as much (if not more than) window manager preference. - -First, we need to decide on a location for our custom menu. Your home -directory is the most logical solution, since you will most likely not have -write access anywhere else. You place the menu file in any directory, and -give it any name you choose, as we will later tell Blackbox the path or -location for this file. - -As an example, let's assume that my home directory is `/home/bhughes' (which it -is). I've decided to keep all my Blackbox related files in a directory named -`blackbox.' After creating the directory, I now have two options for creating -my new menu. I can either copy the system default (usually in -`/usr/local/share/Blackbox/menu') to this directory, or I can create a new -one from scratch. Let's do the latter, for the sake of completeness. - -I've decided to name the file `rootmenu.' I fire up my favorite text editor -and now have a clean file. So let's begin. - - -Menu syntax: ------------- -The menu syntax is very simple and very effective. There are upto three -fields in a menu line. They are of the form: - - [tag] (label or filename) {command or filename} - -The supported tags are as follows: - -[begin] (label for root menu) - - This tells Blackbox to start parsing the menu file. This tag is - required for Blackbox to parse your menu file. If it cannot find it, - the system default menu is used instead. - -[end] - - This tells Blackbox that it is at the end of a menu. This can either - be a submenu or the main root menu. There must be at least one - of these tags in your menu to correspond to the required [begin] tag. - -[exec] (label for command) {shell command} - - This tells Blackbox to insert a command item into the menu. When you - select the menu item from the menu, Blackbox runs `shell command.' - -[exit] (label for exit) - - This tells Blackbox to insert an item that shuts down and exits - Blackbox. Any open windows are reparented to the root window before - Blackbox exits. - -[include] (filename) - - This tells Blackbox to parse the file specified by `filename' inline - with the current menu. `filename' can be the full path to a file - (such as /usr/local/share/Blackbox/brueghel/stylesmenu) or it can - begin with `~/', which will be expanded into your home directory - (e.g. [include] (~/blackbox/stylesmenu) will include - /home/bhughes/blackbox/stylesmenu in my menu) - -[nop] (label - optional) - - This tells Blackbox to insert a non-operational item into the current - menu. This can be used to help format the menu into blocks or sections - if so desired (e.g. you could put all your ssh accounts together, add - a [nop] and then add all your telnet accounts together). [nop] does - accept a label, but it is not required, and a blank item will be used - if none is supplied. - -[style] (label) {filename} - - This tells Blackbox to read `filename' and apply the new textures, - colors and fonts to the current running session. The filename is - just like the [include] tag, it can be the full path to the file, - or it can be of the form `~/path/from/home/dir.' Blackbox also - re-reads the entire menu structure from disk, incase the menu has - changed. - -[submenu] (label) {title for menu - optional} - - This tells Blackbox to create and parse a new menu. This menu is - inserted as a submenu into the parent menu. These menus are parsed - recursively, so there is no limit to the number of levels or nested - submenus you can have. The title for the new menu is optional, if - none is supplied, the new menu's title is the same as the item label. - -[reconfig] (label) - - This tells Blackbox to reread the current style and menu files and - apply any changes. This is useful for creating a new style or theme, - as you don't have to constantly restart Blackbox every time you save - your style. - -[restart] (label) {shell command - optional} - - This tells Blackbox to restart. If `shell command' is supplied, it - shuts down and runs the command (which is commonly the name of another - window manager). If the command is omitted, Blackbox restarts itself. - -[workspaces] (label) - - This tells Blackbox to insert a "link" to the workspaces menu directly - into your menu. This is handy for those users who can't access the - workspace menu directly (e.g. if you don't have a 3 button mouse, it's - rather hard to middle click to show the workspace menu). This is a - "link" to the systems workspace menu, so multiple [workspaces] tags - will display the same workspace menu, so expect it to move around if - you do so. ;) - -[config] (label) - - This tells Blackbox to insert the ConfigMenu into your menu. From - this menu you can configure several options stored in your - ~/.blackboxrc, and the changes take effect immediately. - -Comments may be inserted on any line of the file, as long as the first -character on the line is a `#.' - -Also, in the labels/commands/filenames fields, you can escape any character -like so: - - [exec] (\(my cool\) \{XTERM\}) {\(xterm -T \\\"cool XTERM\\\"\)} - -Using `\\' inserts a literal back-slash into the label/command/filename field. - - -Putting it all together: ------------------------- -Alrighty, so let's see if we can understand the arcane incantation above. It -says we have to have a [begin] and an [end] tag, which create our menu and -give it a title. Let's do that first: - - - [begin] (Example \[Menu\]) - - [end] - -Simple enough. Now let's add some items to the list. We always want to have -access to a terminal emulator, be it a regular xterm or something else. -So we add the item to our menu, and it now looks like this: - -... -[begin] (Example \[Menu\]) -[exec] (xterm) {xterm -ls} -[end] -... - -Great! Now let's add us some items to run an irc client, netscape, xv and -some other common programs. This gives up this: - -... -[begin] (Example \[Menu\]) -[exec] (xterm) {xterm -ls} -[exec] (efnet irc) {xterm -e irc fnord irc.efnet.net} -[exec] (Netscape Navigator) {netscape} -[exec] (xv 3.10a) {xv} -[exec] (XEmacs) {xemacs} -[exec] (The GIMP) {gimp} -[exec] (Video Tune) {xvidtune} -[end] -... - -Whoa, wait a second. This menu file is beginning to look a little cluttered. -Not a problem, just like programmers indent and space their code, we can -do this with our menu file, so let's clean it up a bit: - -... -[begin] (Example \[Menu\]) - [exec] (xterm) {xterm -ls} - [exec] (efnet irc) {xterm -e irc fnord irc.efnet.net} - - [exec] (Netscape Navigator) {netscape} - [exec] (XEmacs) {xemacs} - - [exec] (xv 3.10a) {xv} - [exec] (The GIMP) {gimp} - - [exec] (Video Tune) {xvidtune} -[end] -... - -Ahh... now that looks a little better. Now we decide that we kind of like the -spacing in the file, and decide we want to apply it to the menu itself. Now -we take advantage of the [nop] tag: - -... -[begin] (Example \[Menu\]) - [exec] (xterm) {xterm -ls} - [exec] (efnet irc) {xterm -e irc fnord irc.efnet.net} - - [nop] - - [exec] (Netscape Navigator) {netscape} - [exec] (XEmacs) {xemacs} - - [nop] - - [exec] (xv 3.10a) {xv} - [exec] (The GIMP) {gimp} - - [nop] - - [exec] (Video Tune) {xvidtune} -[end] -... - -Now, let's create a submenu to put some items to change between all these -themes we downloaded from http://blackbox.themes.org/. Let's assume we -untarred the themes into the ~/.blackbox directory like the documentation on -the themes.org site recommends. - -... -[begin] (Example \[Menu\]) - [exec] (xterm) {xterm -ls} - [exec] (efnet irc) {xterm -e irc fnord irc.efnet.net} - - [nop] - - [exec] (Netscape Navigator) {netscape} - [exec] (XEmacs) {xemacs} - - [nop] - - [exec] (xv 3.10a) {xv} - [exec] (The GIMP) {gimp} - - [nop] - - [exec] (Video Tune) {xvidtune} - - [submenu] (Themes) {Themes from blackbox.themes.org} - [style] (Blackbox) {~/.blackbox/Styles/blackbox} - [style] (Blackbox II) {~/.blackbox/Styles/blackbox2} - [style] (Hardware) {~/.blackbox/Styles/hardware} - [style] (Nova) {~/.blackbox/Styles/nova} - [style] (Orbital) {~/.blackbox/Styles/orbital} - [style] (Orbital II) {~/.blackbox/Styles/orbital2} - [style] (Seething) {~/.blackbox/Styles/seething} - [style] (Zero) {~/.blackbox/Styles/zero} - [style] (Cold Fusion) {~/.blackbox/Styles/coldfusion} - [end] -[end] -... - -Even better. Now hold on a second, if we have our themes and styles in -~/.blackbox why do we have to have our menu in ~/blackbox? Answer: WE DON'T! -This is where the choice comes. Do we keep our stuff in two separate -directories? Do we put it all in one directory? That is up to you to decide. -I personally prefer to keep everything in one directory (but, I use ~/blackbox -and have been for a long, long time; long before blackbox.themes.org was -even thought of... and again that is *personal* preference, not a hard-fast -rule). - -Now that we've gotten a feel for the menu syntax, we decide to finish off our -menu. In addition to the styles we downloaded, we decide we also want to -keep a submenu for the default styles that came with Blackbox. All we need -to do is [include] the styles file from the share directory for Blackbox. -After putting everything together, we have: - - -... -# custom menu file for Blackbox - -[begin] (Example \[Menu\]) - [exec] (xterm) {xterm -ls} - [exec] (efnet irc) {xterm -e irc fnord irc.efnet.net} - - [nop] - - [exec] (Netscape Navigator) {netscape} - [exec] (XEmacs) {xemacs} - - [nop] - - [exec] (xv 3.10a) {xv} - [exec] (The GIMP) {gimp} - - [nop] - - [exec] (Video Tune) {xvidtune} - - [nop] (...) - - [submenu] (Themes) {Themes from blackbox.themes.org} - [style] (Blackbox) {~/.blackbox/Styles/blackbox} - [style] (Blackbox II) {~/.blackbox/Styles/blackbox2} - [style] (Hardware) {~/.blackbox/Styles/hardware} - [style] (Nova) {~/.blackbox/Styles/nova} - [style] (Orbital) {~/.blackbox/Styles/orbital} - [style] (Orbital II) {~/.blackbox/Styles/orbital2} - [style] (Seething) {~/.blackbox/Styles/seething} - [style] (Zero) {~/.blackbox/Styles/zero} - [style] (Cold Fusion) {~/.blackbox/Styles/coldfusion} - -# include the default style menu... this is assuming Blackbox was installed -# into /usr/local - - [nop] - - [include] (/usr/local/share/Blackbox/styles/stylesmenu) - [end] - - [workspaces] (Workspace list) - - [submenu] (Restart) {Restart which?} - [restart] (Blackbox) - -# let's also give us access to some other window managers - - [restart] (Window Maker) {wmaker} - [restart] (Enlightenment) {enlightenment} - [restart] (KWM) {kwm} - [restart] (TWM) {twm} - [end] - - [nop] (...) - - [reconfig] (Reconfigure) - [exit] (Quit!) -[end] -... - -And voila! our menu file is finished. Now we need to tell Blackbox to read -this menu file. We do this by editing the file ~/.blackboxrc. - -NOTE: your ~/.blackboxrc is auotmatically updated every time Blackbox restarts, -reconfigures, changes styles or exits. Changes to dynamic data like workspace -count, names, etc. is lost. About the only thing you can change and have it -preserved is the menu filename, which is what we are about to change. - -The format of ~/.blackboxrc is in the X resource database format (just like -~/.Xdefaults). Since the file is updated automatically, it may be full of -stuff or it may not even exist (especially if this is the first time we've -ran Blackbox). Don't worry if you have to create ~/.blackboxrc, Blackbox will -see the file the next time it starts. - -What we need to do is change the resource for the menu's filename. This is -done by changing (or adding) the line that looks like so: - -... -session.menuFile: /path/to/some/file -... - -If this resource exists, we change it. If it does not, we add it. Depending -on where we put the menu file, our new resource could look like this: - -... -session.menuFile: /home/bhughes/blackbox/rootmenu -... - -We save ~/.blackboxrc and then restart Blackbox (reconfiguring doesn't work, -we need Blackbox to completely shutdown and reread ALL of it's configuration -files, not just the ones that control colors/fonts/etc.) - -If we've done everything correctly, Blackbox restarts itself and our new menu -is now ready for use. If something doesn't work, read over the above example -again to make sure you didn't forget a step or leave out the necessary tags. - -Now that Blackbox has been told where to find it's menu, it does a little more. -Blackbox 0.51.x introduces automagic menu updates. As long as you never -change session.menuFile, you will never have to restart or reconfigure Blackbox -whenever you change your menu. Blackbox watches the timestamps on all the -files it reads to build your menu. If any of them change, they are reread and -your menu updated. This check is done everytime you open the root menu. Like -I said... it is a check, it doesn't reread the menu everytime, it just looks -at the modification time and rereads when it changes. diff --git a/data/README.style b/data/README.style deleted file mode 100644 index 9067806..0000000 --- a/data/README.style +++ /dev/null @@ -1,330 +0,0 @@ --- data/README.style for Blackbox 0.61.x - an X11 Window manager - -Creating a new style (aka "theme"): ------------------------------------ -After getting Blackbox up and running, the next thing you want to do is change -the colors/fonts/etc. on the screen. Blackbox uses a "style" to read its -configuration information. A style in Blackbox consists of X resources placed -in a file. Just like the menu file (see README.menu), the style file can be -put anywhere on the filesystem; as long as you have read access to the file, -Blackbox can use it. - -First, we need to decide where to put our style file, and what to name it. -I recommend using the naming scheme described on http://blackbox.themes.org/ -when creating styles. - -Let's get started. Let's put our new style into a file named `results.' -Following the themes.org naming scheme, this file will go into -.blackbox/Styles. Same as with the menu file, we use our favorite text editor -to create the new style. - -X resources consist of a key and a value. The key is constructed of several -smaller keys, delimited by a period (`.'). Keys may also contain a star (`*') -to serve as a wildcard, which means that one line of typed text will match -several keys. This is useful for styles that are based on one or two colors. - -Blackbox allows you to configure it's three main components: the toolbar, the -menus and the window decorations. Lets begin by creating a style for our -toolbar. - -First we need to define a "texture" for the toolbar and it's components. -Textures tell Blackbox how to mold or shape the colors we supply. - -A texture is comprised of the following elements: - - Raised / Sunken / Flat give the component a raised, sunken - or flat appearance (respectively) - - Solid / Gradient tell Blackbox whether to draw a solid - or gradiented texture - - Interlaced tells Blackbox to interlace a - gradient (and gradient ONLY) texture - - Bevel1 / Bevel2 tells Blackbox which type of bevel - to use. - -NOTE on Bevel1 / Bevel2: - -Bevel1 is the default bevel. The shading is placed on the edge of the image. -Bevel2 is an alternative. The shading is placed one pixel in from the edge -of the image. - -Now that we understand that, let's define the textures for the toolbar. The -toolbar has a main frame, buttons, two labels and a clock label. The buttons -have 2 states, so we provide textures for both the normal and the pressed -state. - -... -toolbar: Raised Diagonal Gradient Bevel1 -toolbar.button: Raised Diagonal Gradient Bevel1 -toolbar.button.pressed: Sunken Diagonal Interlaced Gradient Bevel1 -toolbar.clock: Flat Interlaced Gradient -toolbar.label: Flat Interlaced Gradient -... - -NOTE: the texture strings don't have to be capitalized like they did in -previous versions. They are still placed in capitals here, because things like -the bbtools still use the old method. - -Next we define colors for the textures. Colors can be any valid X colorname -(from the RGB database) or it can be a color specifier, as described by -'man 1 X.' - -Let's see how our file looks after adding colors: - -... -toolbar: Raised Diagonal Gradient Bevel1 -toolbar.button: Raised Diagonal Gradient Bevel1 -toolbar.button.pressed: Sunken Diagonal Interlaced Gradient Bevel1 -toolbar.clock: Flat Interlaced Gradient -toolbar.label: Flat Interlaced Gradient - -toolbar.color: rgb:8/8/7 -toolbar.colorTo: grey20 -toolbar.button.color: grey -toolbar.button.colorTo: grey20 -toolbar.button.pressed.color: rgb:4/4/38 -toolbar.button.pressed.colorTo: rgb:f/f/d -toolbar.clock.color: grey20 -toolbar.clock.colorTo: rgb:8/8/7 -toolbar.label.color: grey20 -toolbar.label.colorTo: rgb:8/8/7 -toolbar.textColor: grey85 -... - -As you have noticed, all textures have a color and a colorTo key. These keys -are required for gradient images. For solids, only color is needed. You will -also notice that we have supplied the color for the text on the toolbar. Not -all textures have a text color, just certain base textures. - -Next, let's move onto the menus. Since Blackbox was written in C++, all of -the menus used in it are subclasses of one generic base class. Blackbox reads -the style for the configuration for that base class, which applies to all -the menus used in Blackbox. - -The menu has two main parts, the title and the frame. There is nothing -visible under them, so we only configure these two components. The menu frame -and menu title BOTH have a configurable text color, and the menu frame has a -highlight color and the corresponding highlighted text color key. Let's assign -some textures and colors to our menu, and see what our style file looks like -so far: - -... -toolbar: Raised Diagonal Gradient Bevel1 -toolbar.button: Raised Diagonal Gradient Bevel1 -toolbar.button.pressed: Sunken Diagonal Interlaced Gradient Bevel1 -toolbar.clock: Flat Interlaced Gradient -toolbar.label: Flat Interlaced Gradient - -toolbar.color: rgb:8/8/7 -toolbar.colorTo: grey20 -toolbar.button.color: grey -toolbar.button.colorTo: grey20 -toolbar.button.pressed.color: rgb:4/4/38 -toolbar.button.pressed.colorTo: rgb:f/f/d -toolbar.clock.color: grey20 -toolbar.clock.colorTo: rgb:8/8/7 -toolbar.label.color: grey20 -toolbar.label.colorTo: rgb:8/8/7 -toolbar.textColor: grey85 - -menu.title: Raised Diagonal Interlaced Gradient Bevel1 -menu.frame: Raised Diagonal Gradient Bevel1 - -menu.title.color: grey20 -menu.title.colorTo: rgb:8/8/7 -menu.title.textColor: grey85 -menu.frame.color: rgb:8/8/7 -menu.frame.colorTo: grey10 -menu.frame.textColor: white -menu.frame.highlightColor: grey85 -menu.frame.hiTextColor: grey20 -... - -Next, we need to configure our windows. Windows are like buttons, they have -two states, focused and unfocused. There for we define a separate texture -for unfocused windows and focused windows. The buttons on the titlebar -are focus dependant also, so we need to configure them as well. The buttons -only have one "pressed" state, so we only have to define that once, instead of -having a focus.pressed state and an unfocus.pressed state. The window frame -is the thin border around the client window. Let's be sure to catch it as well. - -After adding the window config, our style now looks like this: - -... - -toolbar: Raised Diagonal Gradient Bevel1 -toolbar.button: Raised Diagonal Gradient Bevel1 -toolbar.button.pressed: Sunken Diagonal Interlaced Gradient Bevel1 -toolbar.clock: Flat Interlaced Gradient -toolbar.label: Flat Interlaced Gradient - -toolbar.color: rgb:8/8/7 -toolbar.colorTo: grey20 -toolbar.button.color: grey -toolbar.button.colorTo: grey20 -toolbar.button.pressed.color: rgb:4/4/38 -toolbar.button.pressed.colorTo: rgb:f/f/d -toolbar.clock.color: grey20 -toolbar.clock.colorTo: rgb:8/8/7 -toolbar.label.color: grey20 -toolbar.label.colorTo: rgb:8/8/7 -toolbar.textColor: grey85 - -menu.title: Raised Diagonal Interlaced Gradient Bevel1 -menu.frame: Raised Diagonal Gradient Bevel1 - -menu.title.color: grey20 -menu.title.colorTo: rgb:8/8/7 -menu.title.textColor: grey85 -menu.frame.color: rgb:8/8/7 -menu.frame.colorTo: grey10 -menu.frame.textColor: white -menu.frame.highlightColor: grey85 -menu.frame.hiTextColor: grey20 - -window.focus: Raised Diagonal Interlaced Gradient Bevel1 -window.focus.button: Raised Diagonal Gradient Bevel1 -window.unfocus: Raised Diagonal Gradient Bevel1 -window.unfocus.button: Sunken Diagonal Gradient Bevel1 -window.button.pressed: Flat Diagonal Interlaced Gradient -window.frame: Raised Solid Bevel1 - -window.focus.color: grey -window.focus.colorTo: grey20 -window.focus.textColor: grey85 -window.focus.button.color: grey -window.focus.button.colorTo: grey20 -window.unfocus.color: rgb:8/8/7 -window.unfocus.colorTo: grey20 -window.unfocus.textColor: grey -window.unfocus.button.color: grey20 -window.unfocus.button.colorTo: grey -window.button.pressed.color: rgb:4/4/38 -window.button.pressed.colorTo: rgb:f/f/d -window.frame.color: grey85 -... - -Now all we have to do is finish off the style with a few miscellanous options. -These include the title and menu fonts/justification, border color, bevel and -handle widths, window move style and the root command. - -Fonts must be a valid X11 font screen, or a valid font alias. Use a utility -like `xfontsel' (and others) to preview fonts. Also use the utility -`xlsfonts' to spit out all the current X font names and aliases stored in -the X server. - -Justification can be one of three things: LeftJustify, CenterJustify or -RightJustify. - -The border color is the color applied to the 1 pixel border around the menu -frame/title and the window titlebar/buttons/handle/etc. Setting this color -can have drastic effects on your style, so don't just leave it set to `black' -all the time. ;) - -The bevel and handle widths control the size and spacing of decorations in -Blackbox. The larger the number, the more space Blackbox takes up. - -The window move style tells Blackbox how to move windows when you drag them -with your mouse. There are two options for it: Opaque or Wire. - -The root command is the command run every time the style is loaded (either at -startup or after a reconfigure/style-change). It is used to run a program -like xv, Esetroot, wmsetbg, etc. to set an image/color/pattern on the root -window. Just supply a command and it will be run. - -Also, as a note, an X resource file can have comments. Precede the line with -and exclamation mark `!' and the rest of the line will be ignored. - -Let's finish off the details and take a look at our finished style: - -... -! Results - theme for Blackbox 0.51.x -! by Brad Hughes bhughes@tcac.net - -! define the toolbars textures... note that the interlaced option is new -! in 0.51.x -toolbar: Raised Diagonal Gradient Bevel1 -toolbar.button: Raised Diagonal Gradient Bevel1 -toolbar.button.pressed: Sunken Diagonal Interlaced Gradient Bevel1 -toolbar.clock: Flat Interlaced Gradient -toolbar.label: Flat Interlaced Gradient - -! toolbar colors -toolbar.color: rgb:8/8/7 -toolbar.colorTo: grey20 -toolbar.button.color: grey -toolbar.button.colorTo: grey20 -toolbar.button.pressed.color: rgb:4/4/38 -toolbar.button.pressed.colorTo: rgb:f/f/d -toolbar.clock.color: grey20 -toolbar.clock.colorTo: rgb:8/8/7 -toolbar.label.color: grey20 -toolbar.label.colorTo: rgb:8/8/7 -toolbar.textColor: grey85 - -! menu textures -menu.title: Raised Diagonal Interlaced Gradient Bevel1 -menu.frame: Raised Diagonal Gradient Bevel1 - -! menu colors -menu.title.color: grey20 -menu.title.colorTo: rgb:8/8/7 -menu.title.textColor: grey85 -menu.frame.color: rgb:8/8/7 -menu.frame.colorTo: grey10 -menu.frame.textColor: white -menu.frame.highlightColor: grey85 -menu.frame.hiTextColor: grey20 - -! window textures -window.focus: Raised Diagonal Interlaced Gradient Bevel1 -window.focus.button: Raised Diagonal Gradient Bevel1 -window.unfocus: Raised Diagonal Gradient Bevel1 -window.unfocus.button: Sunken Diagonal Gradient Bevel1 -window.button.pressed: Flat Diagonal Interlaced Gradient -window.frame: Raised Solid Bevel1 - -! window colors -window.focus.color: grey -window.focus.colorTo: grey20 -window.focus.textColor: grey85 -window.focus.button.color: grey -window.focus.button.colorTo: grey20 -window.unfocus.color: rgb:8/8/7 -window.unfocus.colorTo: grey20 -window.unfocus.textColor: grey -window.unfocus.button.color: grey20 -window.unfocus.button.colorTo: grey -window.button.pressed.color: rgb:4/4/38 -window.button.pressed.colorTo: rgb:f/f/d -window.frame.color: grey85 - -! misc... -borderColor: rgb:2/2/1c - -moveStyle: Opaque - -menuJustify: CenterJustify -titleJustify: CenterJustify - -bevelWidth: 2 -handleWidth: 4 - -menuFont: lucidasans-10 -titleFont: lucidasans-bold-10 - -rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20 -... - -Alright! Our style is finished. Let's see how the sucker looks. First we -need to tell Blackbox to use the new style. The way to do that is to edit -your menu (refer to README.menu for this) and add: - -[style] (Results) {~/.blackbox/Styles/results} - -somewhere in our menu. Taking advantage of Blackbox 0.51.x's (and up) -automagic menu updates, all we have to do is close and reopen the root menu -and our new style entry will be visible. Select it and Blackbox will apply -the new style we just created. diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in index d7f87a0..de89aab 100644 --- a/doc/fluxbox.1.in +++ b/doc/fluxbox.1.in @@ -66,7 +66,7 @@ Run on specified screens only or all (by default). Print more information in process. .RE .SH "STARTING FLUXBOX" -fluxbox(1) comes with a program called startfluxbox(8) usually located wherever you installed fluxbox. This script provides you with many options and variables that can be set when starting fluxbox. To actually call fluxbox and begin using it, you should place "exec startfluxbox" in your /.xinitrc or /.xsession (depending on your distribution and/or display manager) as the last executed command. This is assuming that the location of fluxbox(1) and startfluxbox(8) are in your shell's $PATH. Also note that you may need to create the /.xinitrc file or your setup may use /.xsession instead, depending on your X setup. For more information on your shell, please visit your shell's manual page. +fluxbox(1) comes with a program called startfluxbox(8) usually located wherever you installed fluxbox. This script provides you with many options and variables that can be set when starting fluxbox. To actually call fluxbox and begin using it, you should place "exec startfluxbox" in your ~/.xinitrc or ~/.xsession (depending on your distribution and/or display manager) as the last executed command. This is assuming that the location of fluxbox(1) and startfluxbox(8) are in your shell's $PATH. Also note that you may need to create the ~/.xinitrc file or your setup may use ~/.xsession instead, depending on your X setup. For more information on your shell, please visit your shell's manual page. .sp By using fluxbox \-i you'll see the defaults used by fluxbox(1). These are what fluxbox looks for upon startup. In the list of `Defaults:' you'll see a menu file location, this is where you can provide a system\-wide menu file for your users. .sp @@ -190,7 +190,7 @@ described in fluxstyle(1)). .TP 4 \(bu -\fBLock Screen\fR: Locks the screen\&... +\fBLock Screen\fR: Locks the screen. .TP 4 \(bu @@ -202,10 +202,10 @@ described in fluxstyle(1)). .TP 4 \(bu -\fBRestart\fR: Restart the whole darn thing. This starts a completely new fluxbox process, rereads files and redraws all graphical elements. Running applications will remain open, however. +\fBRestart\fR: Restarts the windowmanager. This starts a completely new fluxbox process, rereads files and redraws all graphical elements. Running applications will remain open, however. .TP 4 \(bu -*Exit: Exits fluxbox and probably shuts down the X Window server. +\fBExit\fR: Exits fluxbox and shuts down the X Window server. .SS "Configuration Menu" This menu offers the opportunity to set up fluxbox. It contains many options from the init file, but this is an easier and faster way for most users. .sp @@ -519,7 +519,7 @@ The possible tools are: Other aspects of the toolbar can be configured in two ways: through the toolbar menu, which is accessable in the Configuration part of the RootMenu or with a right click on the edge the toolbar, or by editing the init file (see the RESOURCES section for more information about that). .sp .SS "Configuration via the Toolbar Menu" -All changes take effect immediately, except for a change of the "Toolbar Alpha", which needs a restart to make the change visible. Here are the settings: +All changes take effect immediately, which needs a restart to make the change visible. Here are the settings: .sp .TP 4 \(bu @@ -1715,36 +1715,6 @@ You can also place [group] tag around several [app] tags, with an [end] tag to i .RE Parameters in the `apps' file are case\-sensitive. Application names are taken from the first X window WM_CLASS attribute by default (WM_NAME = title, WM_WINDOW_ROLE = role). You can see this attribute by using the xprop command. Transient windows are not affected by application settings. Take care when using regular expressions. If you are not familiar with regular expressions you can disable this feature by specifying \-\-disable\-regexp during configure. Plain strings will then be matched. .sp -.SH "GROUPS" -Since version 0.1.11, fluxbox has a feature called autogrouping, that is apps are automatically grouped together if they are in the same group. NOTE: this feature is deprecated since version 0.9.1 in favor of grouping using the `apps' file, since it is much more powerful. -.sp -You can create groups simply by editing the ~/.fluxbox/groups file. This file takes the format of: -.sp -.sp -.RS 4 -.nf - <...> -.fi -.RE -where elements can be found with this command: -.sp -.sp -.RS 4 -.nf -$> xprop WM_CLASS -.fi -.RE -Just type this command into a terminal and use the mouse to click on the desired app and it will tell you what to write as an element (use the first of the two names returned). Each line forms a different group, e.g.: -.sp -.sp -.RS 4 -.nf -Navigator nedit -xterm -.fi -.RE -This will create two groups, one with netscape and nedit, and one with xterm. The new window will only group itself to other windows on the same workspace and to the last window that was focused. -.sp .SH "THE SLIT" The slit is a special fluxbox window frame that can contain dockable applications, e.g. \fIbbtools\fR or \fIwmapps\fR. .sp @@ -1853,8 +1823,6 @@ Blackbox was written and maintained by Brad Hughes and Je .sp The Official fluxbox website: http://www.fluxbox.org .sp -Many compatible themes: \- http://boxwhore.org \- http://themes.freshmeat.net/ -.sp This manpage is the combined work of: .sp .TP 4 diff --git a/nls/sv_SE/Translation.m b/nls/sv_SE/Translation.m index ec2a7c2..76c329d 100644 --- a/nls/sv_SE/Translation.m +++ b/nls/sv_SE/Translation.m @@ -6,9 +6,12 @@ $set 1 #Align 2 Nere till vänster 3 Nere till höger 4 Horisontell +5 Till vänster 6 Till vänster nere 7 Till vänster i mitten 8 Till vänster uppe +9 Relativ +10 Till höger 11 Till höger nere 12 Till höger i mitten 13 Till höger uppe @@ -19,10 +22,23 @@ $set 1 #Align $set 2 #BaseDisplay +1 Avbryter... dumpar core\n +2 Stänger ner\n +3 %s: signal %d fångad\n $set 3 #Common +1 Alpha 2 Göm automatiskt +3 Kompilerad +4 Kompilerings val +5 Kompilator +6 Kompilator version +13 avstängd +14 Fel +16 Maximera över +18 Synbar +19 Det finns ingen bakgrunds val för detta tema. Var vänlig läs manualen eller läs FAQ. $set 4 #Configmenu @@ -38,48 +54,134 @@ $set 4 #Configmenu 13 Halv hafsig fokus 14 Hafsig fokus 15 Dra fönster mellan arbetsytor +16 Tvinga pseudo-transparens +17 Meny alpha +18 Transparens +19 Fokuserad fönsters alpha +20 Icke fokuserad fönsters alpha +21 Flikval +22 Flikar i titelraden +23 Externa flikars bredd +24 Klick i flik ger fokus +25 Musfokus i flik $set 5 #Ewmh +1 Slut på minne, kan inte allokera minne för EWMH klientlista. $set 6 #FbTkError +1 Varning! Höjden överskrider 3200, sätter höjd till 3200. +2 Varning! Bredden överskrider 3200, sätter bredden till 3200 +3 Varning! Kan inte ladda grundfonten +4 Allokerings fel. +5 Fel vid skapande av pixmap. +6 Kan inte skapa XImage +7 Kunde inte läsa +8 Varning! Kunde inte hitta rätt format för alpha. +9 Varning! Kunde inte skapa alpha bild. +10 Varning! Kunde inte skapa alpha pixmap. +11 Misslyckades att hitta format för skärm(%d) +12 Slut på minne +13 Slut på minne vid allokering av blå buffer. +14 Slut på minne vid allokering av grön buffer. +15 Slut på minne vid allokering av röd buffer. +16 Misslyckades att läsa tema objekt +18 Sätter grundvärde + $set 7 #Fluxbox +1 rc filnamn är felaktigt! +2 Kunde inte ladda gruppfil +3 Kunde inte ladda databasen +4 Försöker igen med +5 Varning! Kunde inte hitta skärm att placera fönster på +6 kan inte skapa katalog %s +7 Kan inte hitta skärm att hantera.\nSe till att det inte är någon annan fönsterhanterare som körs. +8 Fel vid evalueringen av regular expression +10 Kan inte ansluta till X server.\nStarta X innan du startar Fluxbox. +11 Varning! X server har ingen support för locale +12 Varning! Kan inte sätta locale modifiers $set 8 #Gnome +1 Fatal: Slut på minne. Kan inte allokera GNOME klientlista. $set 9 #Keys +1 Keys: Fel på rad +2 Keys: Misslyckades att slå ihop keytree! +3 Keys: Felaktig tangent/modifierare på rad $set 10 #Menu +1 Konfiguration +2 Fluxbox grundmeny 3 Avsluta 4 Ikoner +5 Lager... +6 På huvud... 7 Placering +8 Ladda om konfiguration 9 Starta om +10 Varning: obalanserade [encoding] taggar $set 11 #Remember +1 Dekorationer +2 Dimensioner +3 Hoppa till arbetsyta +4 Lager +5 Kom ihåg... +6 Position +7 Spara vid stängning +8 Skugga +9 Klibbig +10 Okänd apps tag +11 Arbetsyta +12 Huvud +13 Transparens + $set 12 #Screen +1 BScreen::BScreen: Ett fel uppstod med X.\nEn annan fönsterhanterare körs. 2 W: %4d x H: %4d +3 BScreen::BScreen: Hanterare skärm %d med visual 0x%lx, djup %d\n 4 W: %04d x H: %04d $set 13 #Slit +1 Klienter +2 Flytta ner +3 Flytta upp 4 Slitriktning +5 Slitlager +6 Slit på huvud 7 Slitplacering 8 Slit +9 Spara slitlistan $set 14 #Toolbar 1 Ändra namn på skrivbordet +2 Ikonrads läge +3 Alla fönster +4 Ikoner +5 Inga +6 Arbetsyta +7 Arbetsytans ikoner +9 Verktygsrads lager 10 Verktygslistens placering 11 Verktygslist +12 Verktygsraden bredd i procent +13 Klocka i 24h format +14 Klocka i 12h format +15 Ändra klockformat +16 Visa bilder +17 Inga ikoner +18 Inga ikoner för arbetsytan $set 15 #Window @@ -95,6 +197,8 @@ $set 16 #Windowmenu 7 Skicka till... 8 Skugga 9 Klibbig +10 Döda +11 Använd grundinställningar $set 17 #Workspace @@ -128,4 +232,11 @@ $set 19 #main -log \t\t\tloggar utskriften till en fil.\n\ -help\t\t\t\tvisa denna hjälptext och avsluta.\n\n +$set 20 #layers +1 Äver dock +2 Längst ner +3 Arbetsyta +4 Dock +5 Normal +6 Top diff --git a/nls/sv_SE/generated-ISO-8859-1.m b/nls/sv_SE/generated-ISO-8859-1.m index ec2a7c2..76c329d 100644 --- a/nls/sv_SE/generated-ISO-8859-1.m +++ b/nls/sv_SE/generated-ISO-8859-1.m @@ -6,9 +6,12 @@ $set 1 #Align 2 Nere till vänster 3 Nere till höger 4 Horisontell +5 Till vänster 6 Till vänster nere 7 Till vänster i mitten 8 Till vänster uppe +9 Relativ +10 Till höger 11 Till höger nere 12 Till höger i mitten 13 Till höger uppe @@ -19,10 +22,23 @@ $set 1 #Align $set 2 #BaseDisplay +1 Avbryter... dumpar core\n +2 Stänger ner\n +3 %s: signal %d fångad\n $set 3 #Common +1 Alpha 2 Göm automatiskt +3 Kompilerad +4 Kompilerings val +5 Kompilator +6 Kompilator version +13 avstängd +14 Fel +16 Maximera över +18 Synbar +19 Det finns ingen bakgrunds val för detta tema. Var vänlig läs manualen eller läs FAQ. $set 4 #Configmenu @@ -38,48 +54,134 @@ $set 4 #Configmenu 13 Halv hafsig fokus 14 Hafsig fokus 15 Dra fönster mellan arbetsytor +16 Tvinga pseudo-transparens +17 Meny alpha +18 Transparens +19 Fokuserad fönsters alpha +20 Icke fokuserad fönsters alpha +21 Flikval +22 Flikar i titelraden +23 Externa flikars bredd +24 Klick i flik ger fokus +25 Musfokus i flik $set 5 #Ewmh +1 Slut på minne, kan inte allokera minne för EWMH klientlista. $set 6 #FbTkError +1 Varning! Höjden överskrider 3200, sätter höjd till 3200. +2 Varning! Bredden överskrider 3200, sätter bredden till 3200 +3 Varning! Kan inte ladda grundfonten +4 Allokerings fel. +5 Fel vid skapande av pixmap. +6 Kan inte skapa XImage +7 Kunde inte läsa +8 Varning! Kunde inte hitta rätt format för alpha. +9 Varning! Kunde inte skapa alpha bild. +10 Varning! Kunde inte skapa alpha pixmap. +11 Misslyckades att hitta format för skärm(%d) +12 Slut på minne +13 Slut på minne vid allokering av blå buffer. +14 Slut på minne vid allokering av grön buffer. +15 Slut på minne vid allokering av röd buffer. +16 Misslyckades att läsa tema objekt +18 Sätter grundvärde + $set 7 #Fluxbox +1 rc filnamn är felaktigt! +2 Kunde inte ladda gruppfil +3 Kunde inte ladda databasen +4 Försöker igen med +5 Varning! Kunde inte hitta skärm att placera fönster på +6 kan inte skapa katalog %s +7 Kan inte hitta skärm att hantera.\nSe till att det inte är någon annan fönsterhanterare som körs. +8 Fel vid evalueringen av regular expression +10 Kan inte ansluta till X server.\nStarta X innan du startar Fluxbox. +11 Varning! X server har ingen support för locale +12 Varning! Kan inte sätta locale modifiers $set 8 #Gnome +1 Fatal: Slut på minne. Kan inte allokera GNOME klientlista. $set 9 #Keys +1 Keys: Fel på rad +2 Keys: Misslyckades att slå ihop keytree! +3 Keys: Felaktig tangent/modifierare på rad $set 10 #Menu +1 Konfiguration +2 Fluxbox grundmeny 3 Avsluta 4 Ikoner +5 Lager... +6 På huvud... 7 Placering +8 Ladda om konfiguration 9 Starta om +10 Varning: obalanserade [encoding] taggar $set 11 #Remember +1 Dekorationer +2 Dimensioner +3 Hoppa till arbetsyta +4 Lager +5 Kom ihåg... +6 Position +7 Spara vid stängning +8 Skugga +9 Klibbig +10 Okänd apps tag +11 Arbetsyta +12 Huvud +13 Transparens + $set 12 #Screen +1 BScreen::BScreen: Ett fel uppstod med X.\nEn annan fönsterhanterare körs. 2 W: %4d x H: %4d +3 BScreen::BScreen: Hanterare skärm %d med visual 0x%lx, djup %d\n 4 W: %04d x H: %04d $set 13 #Slit +1 Klienter +2 Flytta ner +3 Flytta upp 4 Slitriktning +5 Slitlager +6 Slit på huvud 7 Slitplacering 8 Slit +9 Spara slitlistan $set 14 #Toolbar 1 Ändra namn på skrivbordet +2 Ikonrads läge +3 Alla fönster +4 Ikoner +5 Inga +6 Arbetsyta +7 Arbetsytans ikoner +9 Verktygsrads lager 10 Verktygslistens placering 11 Verktygslist +12 Verktygsraden bredd i procent +13 Klocka i 24h format +14 Klocka i 12h format +15 Ändra klockformat +16 Visa bilder +17 Inga ikoner +18 Inga ikoner för arbetsytan $set 15 #Window @@ -95,6 +197,8 @@ $set 16 #Windowmenu 7 Skicka till... 8 Skugga 9 Klibbig +10 Döda +11 Använd grundinställningar $set 17 #Workspace @@ -128,4 +232,11 @@ $set 19 #main -log \t\t\tloggar utskriften till en fil.\n\ -help\t\t\t\tvisa denna hjälptext och avsluta.\n\n +$set 20 #layers +1 Äver dock +2 Längst ner +3 Arbetsyta +4 Dock +5 Normal +6 Top diff --git a/nls/sv_SE/generated-UTF-8.m b/nls/sv_SE/generated-UTF-8.m index 5336646..887af67 100644 --- a/nls/sv_SE/generated-UTF-8.m +++ b/nls/sv_SE/generated-UTF-8.m @@ -6,9 +6,12 @@ $set 1 #Align 2 Nere till vänster 3 Nere till höger 4 Horisontell +5 Till vänster 6 Till vänster nere 7 Till vänster i mitten 8 Till vänster uppe +9 Relativ +10 Till höger 11 Till höger nere 12 Till höger i mitten 13 Till höger uppe @@ -19,10 +22,23 @@ $set 1 #Align $set 2 #BaseDisplay +1 Avbryter... dumpar core\n +2 Stänger ner\n +3 %s: signal %d fÃ¥ngad\n $set 3 #Common +1 Alpha 2 Göm automatiskt +3 Kompilerad +4 Kompilerings val +5 Kompilator +6 Kompilator version +13 avstängd +14 Fel +16 Maximera över +18 Synbar +19 Det finns ingen bakgrunds val för detta tema. Var vänlig läs manualen eller läs FAQ. $set 4 #Configmenu @@ -38,48 +54,134 @@ $set 4 #Configmenu 13 Halv hafsig fokus 14 Hafsig fokus 15 Dra fönster mellan arbetsytor +16 Tvinga pseudo-transparens +17 Meny alpha +18 Transparens +19 Fokuserad fönsters alpha +20 Icke fokuserad fönsters alpha +21 Flikval +22 Flikar i titelraden +23 Externa flikars bredd +24 Klick i flik ger fokus +25 Musfokus i flik $set 5 #Ewmh +1 Slut pÃ¥ minne, kan inte allokera minne för EWMH klientlista. $set 6 #FbTkError +1 Varning! Höjden överskrider 3200, sätter höjd till 3200. +2 Varning! Bredden överskrider 3200, sätter bredden till 3200 +3 Varning! Kan inte ladda grundfonten +4 Allokerings fel. +5 Fel vid skapande av pixmap. +6 Kan inte skapa XImage +7 Kunde inte läsa +8 Varning! Kunde inte hitta rätt format för alpha. +9 Varning! Kunde inte skapa alpha bild. +10 Varning! Kunde inte skapa alpha pixmap. +11 Misslyckades att hitta format för skärm(%d) +12 Slut pÃ¥ minne +13 Slut pÃ¥ minne vid allokering av blÃ¥ buffer. +14 Slut pÃ¥ minne vid allokering av grön buffer. +15 Slut pÃ¥ minne vid allokering av röd buffer. +16 Misslyckades att läsa tema objekt +18 Sätter grundvärde + $set 7 #Fluxbox +1 rc filnamn är felaktigt! +2 Kunde inte ladda gruppfil +3 Kunde inte ladda databasen +4 Försöker igen med +5 Varning! Kunde inte hitta skärm att placera fönster pÃ¥ +6 kan inte skapa katalog %s +7 Kan inte hitta skärm att hantera.\nSe till att det inte är nÃ¥gon annan fönsterhanterare som körs. +8 Fel vid evalueringen av regular expression +10 Kan inte ansluta till X server.\nStarta X innan du startar Fluxbox. +11 Varning! X server har ingen support för locale +12 Varning! Kan inte sätta locale modifiers $set 8 #Gnome +1 Fatal: Slut pÃ¥ minne. Kan inte allokera GNOME klientlista. $set 9 #Keys +1 Keys: Fel pÃ¥ rad +2 Keys: Misslyckades att slÃ¥ ihop keytree! +3 Keys: Felaktig tangent/modifierare pÃ¥ rad $set 10 #Menu +1 Konfiguration +2 Fluxbox grundmeny 3 Avsluta 4 Ikoner +5 Lager... +6 PÃ¥ huvud... 7 Placering +8 Ladda om konfiguration 9 Starta om +10 Varning: obalanserade [encoding] taggar $set 11 #Remember +1 Dekorationer +2 Dimensioner +3 Hoppa till arbetsyta +4 Lager +5 Kom ihÃ¥g... +6 Position +7 Spara vid stängning +8 Skugga +9 Klibbig +10 Okänd apps tag +11 Arbetsyta +12 Huvud +13 Transparens + $set 12 #Screen +1 BScreen::BScreen: Ett fel uppstod med X.\nEn annan fönsterhanterare körs. 2 W: %4d x H: %4d +3 BScreen::BScreen: Hanterare skärm %d med visual 0x%lx, djup %d\n 4 W: %04d x H: %04d $set 13 #Slit +1 Klienter +2 Flytta ner +3 Flytta upp 4 Slitriktning +5 Slitlager +6 Slit pÃ¥ huvud 7 Slitplacering 8 Slit +9 Spara slitlistan $set 14 #Toolbar 1 Ändra namn pÃ¥ skrivbordet +2 Ikonrads läge +3 Alla fönster +4 Ikoner +5 Inga +6 Arbetsyta +7 Arbetsytans ikoner +9 Verktygsrads lager 10 Verktygslistens placering 11 Verktygslist +12 Verktygsraden bredd i procent +13 Klocka i 24h format +14 Klocka i 12h format +15 Ändra klockformat +16 Visa bilder +17 Inga ikoner +18 Inga ikoner för arbetsytan $set 15 #Window @@ -95,6 +197,8 @@ $set 16 #Windowmenu 7 Skicka till... 8 Skugga 9 Klibbig +10 Döda +11 Använd grundinställningar $set 17 #Workspace @@ -128,4 +232,11 @@ $set 19 #main -log \t\t\tloggar utskriften till en fil.\n\ -help\t\t\t\tvisa denna hjälptext och avsluta.\n\n +$set 20 #layers +1 Äver dock +2 Längst ner +3 Arbetsyta +4 Dock +5 Normal +6 Top diff --git a/src/Window.cc b/src/Window.cc index b0aa678..b9ef2ff 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -2400,8 +2400,10 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) { functions.resize = true; } - if (changed) + if (changed) { setupWindow(); + applyDecorations(); + } } moveResize(frame().x(), frame().y(), diff --git a/src/main.cc b/src/main.cc index 4554123..e4e16ac 100644 --- a/src/main.cc +++ b/src/main.cc @@ -222,7 +222,7 @@ int main(int argc, char **argv) { } } else if (arg == "-version" || arg == "-v") { // print current version string - cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Henrik Kinnunen " << endl << endl; + cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Fluxbox Team " << endl << endl; exit(EXIT_SUCCESS); } else if (arg == "-log") { if (++i >= argc) { -- cgit v0.11.2