head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.34 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.32 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.30 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.13.0.28 pkgsrc-2011Q2-base:1.13 pkgsrc-2009Q4:1.13.0.26 pkgsrc-2009Q4-base:1.13 pkgsrc-2008Q4:1.13.0.24 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.22 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.20 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.18 pkgsrc-2008Q2-base:1.13 pkgsrc-2008Q1:1.13.0.16 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.13.0.14 pkgsrc-2007Q4-base:1.13 pkgsrc-2007Q3:1.13.0.12 pkgsrc-2007Q3-base:1.13 pkgsrc-2007Q2:1.13.0.10 pkgsrc-2007Q2-base:1.13 pkgsrc-2007Q1:1.13.0.8 pkgsrc-2007Q1-base:1.13 pkgsrc-2006Q4:1.13.0.6 pkgsrc-2006Q4-base:1.13 pkgsrc-2006Q3:1.13.0.4 pkgsrc-2006Q3-base:1.13 pkgsrc-2006Q2:1.13.0.2 pkgsrc-2006Q2-base:1.13 pkgsrc-2006Q1:1.12.0.4 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.2 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.10.0.10 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.8 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.6 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.4 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.2 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.9.0.2 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 buildlink2:1.3.0.2 netbsd-1-6:1.3.0.4 netbsd-1-6-RELEASE-base:1.3 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2006.04.08.15.41.21; author tonio; state dead; branches; next 1.12; 1.12 date 2005.10.20.19.01.11; author tonio; state Exp; branches; next 1.11; 1.11 date 2005.09.27.12.49.04; author tonio; state dead; branches; next 1.10; 1.10 date 2004.09.02.21.56.32; author xtraeme; state Exp; branches; next 1.9; 1.9 date 2004.05.13.04.29.13; author xtraeme; state Exp; branches; next 1.8; 1.8 date 2004.01.29.16.58.03; author jmmv; state Exp; branches; next 1.7; 1.7 date 2003.07.28.17.50.11; author hubertf; state Exp; branches; next 1.6; 1.6 date 2002.12.10.20.39.09; author jschauma; state Exp; branches; next 1.5; 1.5 date 2002.11.10.19.36.59; author jmcneill; state dead; branches; next 1.4; 1.4 date 2002.08.25.21.51.32; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.08.11.13.15.26; author dmcmahill; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2002.04.22.18.39.19; author wiz; state dead; branches; next 1.1; 1.1 date 2002.01.04.02.05.33; author jmcneill; state Exp; branches 1.1.1.1; next ; 1.3.2.1 date 2002.08.11.13.15.26; author jlam; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2002.08.25.21.21.53; author jlam; state Exp; branches; next ; 1.1.1.1 date 2002.01.04.02.05.33; author jmcneill; state Exp; branches; next ; desc @@ 1.13 log @Update wm/fluxbox to 0.9.15.1 Remove patch-a{b,d} as they are already applied upstream Main changelog entries: in 0.9.15.1: - Removed the green background on styles that are not using the new background option. - Bug fixes (compile errors, crash and placement config) in 0.9.15: * Added styleOverlay resource - session.styleOverlay: ~/.fluxbox/overlay * New theme item: background.* * Added new resize mode: Center * Resources changes for titlebar: - The titlebar is now configured by setting: * session.screen.titlebar.left * session.screen.titlebar.right * nls changes: added ko_KR, updated zh_CN, nb_NO * Many bug fixes @ text @$NetBSD: patch-ab,v 1.12 2005/10/20 19:01:11 tonio Exp $ --- nls/be_BY/Translation.m.orig 2005-08-31 22:06:09.000000000 +0200 +++ nls/be_BY/Translation.m @@@@ -203,7 +203,6 @@@@ $set 16 #Windowmenu 9 Ïðûëÿï³öü 10 Çàá³öü -x $set 17 #Workspace 1 Ïðàöî¢íàå ìåñöà %d @ 1.12 log @Small fix for the localization file, gencat under solaris is a bit strict @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update wm/fluxbox to 0.9.14 Update maintainer remove dependancy over bsetroot, fluxbox now provides fbsetroot (and this one builds with gcc4) approved by jmcneill@@ and wiz@@ @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2004/09/02 21:56:32 xtraeme Exp $ d3 5 a7 18 --- util/Makefile.in.orig 2004-09-02 23:16:03.000000000 +0200 +++ util/Makefile.in 2004-09-02 23:16:38.000000000 +0200 @@@@ -94,7 +94,7 @@@@ SUBDIRS = fbrun INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox -bin_PROGRAMS = bsetroot +bin_PROGRAMS = bsetroot_SOURCES = bsetroot.cc bsetroot.hh bsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \ ../src/FbTk/libFbTk.a @@@@ -108,7 +108,7 @@@@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = bsetroot$(EXEEXT) +bin_PROGRAMS = PROGRAMS = $(bin_PROGRAMS) d9 2 a10 18 am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) @@@@ -143,7 +143,7 @@@@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(bsetroot_SOURCES) +DIST_SOURCES = RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ @@@@ -151,7 +151,7 @@@@ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(bsetroot_SOURCES) +SOURCES = all: all-recursive d12 1 @ 1.10 log @Update wm/fluxbox to 0.9.10. Changes: * Old styles should look like they used to * New actions: * directional focus movement: FocusUp, FocusDown, FocusLeft, FocusRight * other: RaiseLayer, LowerLayer, Exit * Added apps file matching on WM_WINDOW_ROLE * use "role=string". Particularly useful for gaim+gimp windows [app] (role=buddy_list) ... * Window menu file * new resource: * session.screen.windowMenu: * The menu file format is the same as the normal ~/.fluxbox/menu but with some special menu items: [iconify], [maximize], [shade], [close], [extramenus] [layer], [sendto] + the all the other menu items that you can use in the normal root menu (i.e [exec] (aterm) {aterm}) The [extramenus] will add "remember" menu example: session.screen0.windowMenu: ~/.fluxbox/windowmenu [begin] [exec] (aterm) {aterm} [maximize] [shade] [close] [end] * Added [wallpapers|wallpapermenu|rootcommands] to possible menuitems * [wallpapers] (directory) {rootcommand} creates a submenu in the menu to click on the wallpaper one wants. default rootcommand is fbsetbg * Improved menu transparent rendering speed and the text is not transparent anymore so you are able to see the text even if you have 100% transparency * New menu theme items: * menu.titleHeight: * menu.itemHeight: The height of the item/title will be the biggest of font height + bevel and the specified height, so the text will always fit. * Added icons in menu and improved menu loading speed * New option for menu file: [key] (label) {argument to key} example: [exec] (aterm) {aterm} * Improve rendering speed of toolbar * Supports _NET_WM_WINDOW_TYPE_DESKTOP * eg nautilus desktop windows are on the bottom, not tabable, etc * Added some new options font loading: *.font: fontname-size:option,specoption1:key=val;key2=val2 etc eg: *.font: Verdana-10:bold,shadow:offsetx=2;offsety=4;color=green *.font: Verdana-10:halo:color=blue possible specoptions atm: halo: color=colorname shadow: color=colorname offsetx=number (negative allowed) offsety=number (negative allowed) * Fixed so one can use to use this in the apps-file: [Layer] {number | literal} ex: [Layer] {BOTTOM} while literal is one of DESKTOP BOTTOM NORMAL TOP DOCK ABOVEDOCK MENU * fluxbox-generate_menu: * Preliminary basic support for icons in fluxbox-generate_menu put a .xpm into ~/.fluxbox/icons. e.g. Eterm.xpm @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update wm/fluxbox to 0.9.9, based on patch sent by Stefan Kruger in PR pkg/25468. News in 0.9.9: * New commands: * Deiconify * Where mode is: * last - deiconify last iconified window * lastworkspace (default) - deiconify last iconified window from current workspace * all - deiconify all iconified windows * allworkspace - deiconify all iconfied windows from current workspace * and dest is: * current (default) - deiconify them on current windows * origin - deiconify them where they were * originquiet - deiconify to old workspace but dont follow * SendToNextWorkspace * sends current window forward workspaces * SendToPrevWorkspace * sends current window backward workspaces * WindowMenu * popups the window menu * New resources: * session.tabsAttachArea: * where mode is: * Window - dropping tabs to any part of the destination-window leads to attaching to that frame (default) * Titlebar - dropping tabs only to the titlebar of the destination- window leads to attaching to that frame * session.screen.overlay.lineWidth: * session.screen.overlay.lineStyle: * Valid arguments: LineSolid, LineOnOffDash LineDoubleDash * session.screen.overlay.joinStyle: * Valid arguments: JoinRound, JoindMiter, JoinBevel * session.screen.overlay.capStyle: * Valid arguments: CapNotLast, CapRound, CapButt, CapProjecting * KDE dockapps docks in systray inside toolbar now * Support aspect ratio hints * Optional decoration on transient windows * Added ! as a comment char in keys file * Improved rendering speed while changing workspace * Improved checking for compiler and compiler version * Improved transparent rendering speed * Remember hidden state for apps * [IconHidden] hides the app from the icon bar * [FocusHidden] hides the app from the list to be reachable via Next/PrevWindow * [Hidden] is [IconHidden] + [FocusHidden] Example ~/.fluxbox/apps: [IconHidden] {true} * Expands tilde for slitlist file * Using WM_CLASS instead of NAME in slitlist file * Window snapping to other windows * More support for Extended Window Manager Hints: * _NET_WM_WINDOW_TYPE * _NET_WM_WINDOW_TYPE_DOCK * _NET_WM_STATE_ABOVE * _NET_WM_STATE_BELOW * _NET_WM_CLIENT_LIST_STACKING * _NET_WM_DESKTOP_VIEWPORT * _NET_WM_DESKTOP_GEOMETRY * _NET_WORKAREA * _NET_ACTIVE_WINDOW * _NET_WM_STATE_HIDDEN * _NET_WM_STATE_SKIP_TASKBAR * sl_SI nls * Updated nl_NL locales * fbrun news: * cycling in tab completion * completes binaries from your $PATH * if you want to use old history tab-complete, press Ctrl-tab * completes path names * Control-C clears the text * Fixed cursor bug * fluxbox-generate_menu news: * Updated German locales * More firefox support * portability fixes * improve menu reloading * more menu entries * French locales * Portuguese locales Bug fixes: * Decoration bug with mwm hint + remember * Drawing issues with big menus * _MOTIF_WM_HINTS decoration toggle bug * No-text-in-iconbar bug on restart * Menu time stamp on root menu * placeWindow caused spinning with screens higher than width e.g. vertical xinerama * compiles in cygwin * update of keys on keymap change * infinite loop in fbrun * window size bug in no-decor windows on start/restart * The _NET_MOVERESIZE_WINDOW crash bug * mplayer -vo xvid bug * menu keyboard navigation bug @ text @d3 2 a4 2 --- util/Makefile.in.orig 2004-05-13 06:01:43.000000000 +0200 +++ util/Makefile.in 2004-05-13 06:02:50.000000000 +0200 d12 2 a13 2 bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \ ../src/FbAtoms.o ../src/FbTk/libFbTk.a @ 1.8 log @Update to 0.9.8. Changes since 0.9.4: News in 0.9.8: - Transparent toolbar - Bug Fixes: Fixed image cache problem (the memory bug) Fixed color parsing bug Fixed iconbar bug in "All Windows" mode Fixed border bug with left/right alignment in iconbar Fixed a loop issue in fluxbox-generate_menu News in 0.9.7: - Two new pixmap styles: Emerge from Nuno Alexandre BlueFlux from Lauri Hakkarainen - Added menu delay/click to open or close sub menus - Added alignment for buttons in icon bar Change Left, Relative or Right via the iconbar mode menu - New menu item [separator] This will create a nice separator line - New theme items: window.label.active: window.label.active.textColor: - New actions: ReloadStyle CommandDialog - this will show a dialog in which you can issue fluxbox commands WorkspaceNameDialog - edit workspaces name dialog (old SetWorkspaceName) SetWorkspaceName SetResourceValueDialog - shows a dialog where you can type the resource name and it's value SetResourceValueCmd BindKey : - this will append key string and action to your keys file and bind the key - Window menu accessible in workspaces client menu - Shadow options for fonts. - Enabled/Disable toolbar menu item ("Visible" menu item) - Toggle images in iconbar - Edit clock format dialog - Send to menu is back - Changed Maximize menu item in Window menu to a multi button item - Added resource session.useMod1 to disable/enable mod1 for Resize/Move window with mod1 + button - Bug fixes: Fixed slit and toolbar autohide bug Fixed image cache bug Fixed some icc warnings Fixed mozilla focus issue Fixed crash bug when adding new workspaces Fixed menu draw bug in empty sub menus News in 0.9.6: - Adding image search paths when loading a style It now looks for pixmaps in and /pixmaps and in file //theme.cfg for this, stylebase is the style directory pixmap styles should use the new format for portability - Added startup script to be used with startfluxbox, to get a consistent frontend for both dm and startx and your fluxbox-session - Added "!" as a comment line for keys file - Added new actions - Improved menu speed - Added -verbose argument to fluxbox - This will enable theme warnings - Configurable tools in toolbar - New theme items for toolbar - Support for _NET_WM_STATE_FULLSCREEN - Nearest-quadrant resizing - Improvements/Updates to fbsetbg and fluxbox-generate_menu - Bug fixes: Fixed some issues with mplayer in fullscreen Fixed java bug with missing drawing bits of window Fixed building with --disable-slit Fixed NLS bad message errors by adding explicit codeset entries Fixed disappearing close button Fixed numlock and scrlock bug in FbTk TextBox Fixed pixmap bug when changing between non-pixmap themes and pixmap themes Fixed empty window bug in SystemTray Fixed toolbar height bug crash News in 0.9.5: - New theme items: - New actions: resizevertical resizehorizontal setworkspacename movetableft movetabright - Set workspace name tool - Search path resource for images session.screen.imageSearchPath This is a list separated by , or space - New height resource for toolbar - session.screen.toolbar.height This will override the style's font height - Support for system tray _NET_SYSTEM_TRAY Applications that support this will show their icon in the toolbar next to the clock. - New texture type: Tiled This will just affect pixmap loaded from file, and it will not scale them. - Improved iconbar - Bug fixes: Fixed Transparency bug in menus Fixed so shaped windows like xmms wont get round corners Fixed shape bug when switching between shaped themes and non shaped Fixed kde dockapp bug FbRun works properly on multiple screens Fixed pesky crash and phantom icons Fixed aspects of focus and raising, including transients Fixed java bug, slow windows Fixed 8 bpp crash @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $ d3 3 a5 3 --- util/Makefile.in.orig 2004-01-15 13:22:41.000000000 +0100 +++ util/Makefile.in @@@@ -95,10 +95,10 @@@@ regex_cmd = @@regex_cmd@@ d7 1 a7 1 INCLUDES = -I../src/FbTk/ d10 5 a14 11 -bsetroot_SOURCES = bsetroot.cc bsetroot.hh -bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \ - ../src/FbAtoms.o ../src/FbTk/libFbTk.a +#HF#bin_PROGRAMS = bsetroot +#HF#bsetroot_SOURCES = bsetroot.cc bsetroot.hh +#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \ +#HF# ../src/FbAtoms.o ../src/FbTk/libFbTk.a MAINTAINERCLEANFILES = Makefile.in @@@@ -109,14 +109,14 @@@@ subdir = util d19 1 a19 1 +#HF#bin_PROGRAMS = bsetroot$(EXEEXT) d22 2 a23 23 -am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) -bsetroot_OBJECTS = $(am_bsetroot_OBJECTS) -bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \ - ../src/FbAtoms.o ../src/FbTk/libFbTk.a -bsetroot_LDFLAGS = +#HF#am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) +#HF#bsetroot_OBJECTS = $(am_bsetroot_OBJECTS) +#HF#bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \ +#HF# ../src/FbAtoms.o ../src/FbTk/libFbTk.a +#HF#bsetroot_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@@@ -126,7 +126,7 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/bsetroot.Po +#HF#@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/bsetroot.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ @@@@ -144,7 +144,7 @@@@ LTCOMPILE = $(LIBTOOL) --mode=compile $( d28 1 a28 1 +#HF#DIST_SOURCES = $(bsetroot_SOURCES) d32 1 a32 1 @@@@ -152,7 +152,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d37 1 a37 1 +#HF#SOURCES = $(bsetroot_SOURCES) a40 33 @@@@ -198,9 +198,9 @@@@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) - @@rm -f bsetroot$(EXEEXT) - $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS) +#HF#bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) +#HF# @@rm -f bsetroot$(EXEEXT) +#HF# $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -229,7 +229,7 @@@@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/bsetroot.Po@@am__quote@@ +#HF#@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/bsetroot.Po@@am__quote@@ distclean-depend: -rm -rf $(DEPDIR) @@@@ -477,8 +477,8 @@@@ all-local: startfluxbox clean-local: rm -f startfluxbox fluxbox-generate_menu -bsetroot.o: bsetroot.cc ../config.h bsetroot.hh \ - ../src/FbRootWindow.hh ../src/FbAtoms.hh +#HF#bsetroot.o: bsetroot.cc ../config.h bsetroot.hh \ +#HF# ../src/FbRootWindow.hh ../src/FbAtoms.hh startfluxbox: startfluxbox.in @@regex_cmd@@ -e "s,@@pkgdatadir@@,$(pkgdatadir),g" \ @ 1.7 log @Update fluxbox to 0.9.4. Changes: * Keyboard navigation in menus * Keys: Up/Down: select menu item Left/Right: go in/out from sub menus Escape: close menu and return focus to windows Enter: run/execute/toggle menu item To set input focus on the menu you either click on the title bar or bring it up with key bindings * New action strings * ArrangeWindows This will arrange the windows on the current desktop * ShowDesktop This will iconify all windows on the current desktop * The same action strings that are in keys file can now be used in the menu example: [ArrangeWindows] (arrange windows) * New theme items * toolbar.button.borderWidth: * toolbar.borderWidth: * toolbar.bevelWidth: * toolbar.borderColor: * slit.borderWidth: * slit.bevelWidth: * slit.borderColor: * [startup] option in remember file Can now add entries to apps file like: [startup] {xterm} Then "xterm" will be launched on fluxbox startup. Can also give a screen option: [startup] (screen=1) {xterm} will start it on screen 1 rather than the default 0. * Rounded corners on menu, windows and toolbar Theme items: * menu.roundCorners: * toolbar.shaped: * window.roundCorners: Shape item can be: TopLeft TopRight BottomLeft and/or BottomRight example: menu.roundCorners: TopRight BottomLeft * The current style is now marked in the style menu * Compile time option for toolbar --disable-toolbar --enable-toolbar (default) * Emacs style key bindings in fbrun * Tab completion in fbrun * Group persistence over a restart * Maximization stop on slit and toolbar (check Maximize Over menu items) * Support for _NET_WM_STRUT * Regular expression support for remember Bug fixes: * Toggle maximize vertical/horizontal * Slit/Toolbar auto hide bug * Button alignment bug in title bar * Trailing whitespace in group file resource * Group cycling Based on patch by Tom Hensel [ tom at replic8 dot net ]. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- util/Makefile.in.orig Thu Jul 10 18:03:35 2003 d5 1 a5 1 @@@@ -95,10 +95,10 @@@@ d8 1 a8 1 bin_SCRIPTS = fbsetbg fluxbox-generate_menu d11 2 a12 2 -bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \ - ../src/FbTk/libFbTk.a d15 2 a16 2 +#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \ +#HF# ../src/FbTk/libFbTk.a d20 1 a20 1 @@@@ -107,14 +107,14 @@@@ d41 1 a41 1 @@@@ -124,7 +124,7 @@@@ d50 1 a50 1 @@@@ -142,7 +142,7 @@@@ d59 1 a59 1 @@@@ -150,7 +150,7 @@@@ d68 1 a68 1 @@@@ -196,9 +196,9 @@@@ d81 1 a81 1 @@@@ -227,7 +227,7 @@@@ d90 11 a100 9 @@@@ -473,7 +473,7 @@@@ distclean-local: rm -f *\~ Makefile.in -bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh +#HF#bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @ 1.6 log @Upgrade wm/fluxbox to 0.1.14 using patches provided by Juan in PR pkg/19341. While we're at it, remove conflict with blackbox since this release does not use blackbox-nls files anymore and we can depend on bsetroot as blackbox and openbox do. Changes for 0.1.14: *02/11/08: * Minor update in fluxbox-generate_menu (Han) * Fixed blackbox.cat to fluxbox.cat nls/* *02/11/07: * Fixed tab font on restart bug. Theme.cc/hh, Screen.cc * Fixed crash bug in rotated font implementation. XFontImp.cc * Fixed caps-, num- and scrolllock maskes in Alt+drag/resize Window.cc *02/11/25: * Fixed vertical tabs for XFontImp XFontImp.cc/hh, Font.hh/cc, Tab.cc, Screen.cc, DrawUtil.cc/hh *02/11/24: * Removed interlace compile time option (Henrik) Image.hh/cc * Fixed bug [ 641136 ] OpenOffice 1.0.1 aborts (Simon) Ewmh.cc * Fixed bug [ 561602 ] Problem using ToggleDecor in terminals (Simon) Window.cc/hh * Fixed bug [ 642189 ] Wrong AA font on init (Simon) Font.cc Changes for 0.1.13: *02/11/17: * Fixed bug in toggleTab Window.cc * Fixed alignment bug in Tab Tab.cc * Fixed HAVE_XFT_UTF8 check (Simon) configure.in, XftFontImp.cc *02/11/15: * Fixed antialias bug in toolbar * Fixed bug [ 627897 ] Clicking tab leads to crashing X-Server. Tab.cc *02/11/14: * Fixed bug [ 604958 ] Menu not (full) visible when tabs bottom Rootmenu.cc/hh * Fixed bug [ 581588 ] Toolbar auto-hiding Toolbar.cc *02/11/13: * Clean up in Slit Slit.cc/hh, Screen.cc * Fixed caps, num and scroll lock modifier checks (fixed Bug: [ 522673 ] Numlock not handled correctly in Solaris) Keys.cc/hh *02/11/12: * Updated fluxbox-generate_menu (Han) * Fixed alignment in window label Window.cc * Fixed history in FbRun * Updated FbRun to use the new font system * Removed window size limitation, fixes Debian bug #159709 (Simon) Window.cc * Fixed geometry/position window size and alignment problem (Simon) Screen.cc *02/11/03: * Fixed Toolbar workspace label text color. Theme.cc *02/10/25: * Renamed Icon.hh/cc to Iconmenu.hh/cc * Clean up (fixed bug [ 608945 ] xmms crashes fluxbox ) BaseDisplay.hh/cc, Screen.cc/hh, Tab.cc, Window.cc *02/10/24: * Updated fluxbox-generate_menu (Thanks Han) *02/10/23: * Fixed auto_ptr assignment so it compiles with gcc 2.95.x fluxbox.cc, Window.cc * Minor cleaning in Windowmenu.cc/hh *02/10/22: * Fixed isGroupable for FluxboxWindow, It should report if the window is groupable if it's not transient, nonresiable and nonmaximizable Window.hh/cc *02/10/20: * Updated it_IT translation (Thanks Filippo Pappalardo) *02/10/19: * Fixed terminal option for fluxbox-generate_menu (Thanks Han) * Fixed bug [ 604634 ] Fluxbox 0.1.11 menu on iconbar problem Toolbar.cc * Fixed ascent and descent in FontImps * Added testsuit for FbTk::Font src/tests/testFont.cc, src/tests/Makefile * Updated fluxbox-generate_menu it_IT locales and added DEFAULT_TERM value (Thanks Filippo Pappalardo) *02/10/18: * Added it_IT locales to fluxbox-generate_menu and updated data/nls/it_IT (Thanks Filippo Pappalardo) *02/10/16: * Fixed UTF-8 for antialias fonts XftFontImp.cc/hh, Font.cc * Fixed support for: _NET_WM_DESKTOP, _NET_NUMBER_OF_DESKTOPS, CVSURRENT_DESKTOP, _NET_ACTIVE_WINDOW, _NET_CLOSE_WINDOW Ewmh.hh/cc *02/10/15: * Conditional compile/linking of Xft specific files src/Makefile.am, configure.in * Antialias in Windowmenu, Tab and geometry window Window.cc, Screen.cc, Toolbar.cc, Theme.cc/hh, Tab.cc, IconBar.cc * Antialias option in Configmenu Configmenu.cc, Screen.cc/hh, Theme.cc/hh *02/10/14: * Added XftFontImp.hh/cc for Xft font support. Compile with --enable-xft *02/10/13: * Minor cleaning in configure.in * Fixed grab reconfigure bug Window.cc * Fixed UTF-8 support in XmbFontImp.cc * Moved font system specific stuff from Font.hh/cc to font implementation classes. * Added FontImp.hh, XFontImp.hh/cc, XmbFontImp.hh/cc For the new font implementation bridge pattern. *02/10/11: * Fixed support for _NET_WM_STATE with _NET_WM_STATE_STICKY and _NET_WM_STATE_SHADED Ewmh.cc *02/10/02: * Added Ewmh.hh/cc for Extended Window Manager Hints *02/09/21: * New menu item (Thanks Han) fluxbox-generate_menu * Latvian language support (Thanks Artis Trops) *02/09/14: * Fixed bug [ 604463 ] mplayer fullscreen fails (Henrik) Window.cc * Added Color.cc and moved color handling from Image.cc to it. (Henrik) * Added Texture.cc and Texture::setFromString (Henrik) * Proper handling of sticky windows when cycling (Simon) @ text @d1 1 a1 1 $NetBSD: $ d3 3 a5 4 --- util/Makefile.in.orig Tue Dec 10 15:06:19 2002 +++ util/Makefile.in Tue Dec 10 15:08:09 2002 @@@@ -94,20 +94,18 @@@@ d8 1 a8 1 -bin_SCRIPTS = bsetbg fluxbox-generate_menu d10 7 a16 4 +bin_SCRIPTS = fluxbox-generate_menu bsetroot_SOURCES = bsetroot.cc bsetroot.hh bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \ ../src/StringUtil.o ../src/FbTk/libFbTk.a d20 1 a20 3 -EXTRA_DIST = bsetbg fluxbox-generate_menu +EXTRA_DIST = fluxbox-generate_menu subdir = util d25 1 d28 71 a98 1 am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) @ 1.5 log @Update fluxbox to 0.1.12; closes PR #18930 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $ d3 3 a5 16 --- src/Makefile.in.orig Sat Apr 20 06:11:45 2002 +++ src/Makefile.in @@@@ -152,6 +152,10 @@@@ fluxbox_LDADD = $(LDADD) fluxbox_DEPENDENCIES = fluxbox_LDFLAGS = CXXFLAGS = @@CXXFLAGS@@ +CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) +CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) +CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) +LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@@@ -171,9 +175,12 @@@@ GZIP_ENV = --best SOURCES = $(fluxbox_SOURCES) OBJECTS = $(fluxbox_OBJECTS) d7 8 a14 9 +Image.o: Image.C +Image.lo: Image.C + all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .obj .s +.SUFFIXES: .S .c .cc .C .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile a15 16 @@@@ -254,10 +261,16 @@@@ maintainer-clean-libtool: fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES) @@rm -f fluxbox$(EXEEXT) $(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS) +.cc.C: + cp -f $< $@@ +.C.o: + $(CXXCOMPILE_NOOPT) -c $< .cc.o: $(CXXCOMPILE) -c $< .cc.obj: $(CXXCOMPILE) -c `cygpath -w $<` +.C.lo: + $(LTCXXCOMPILE_NOOPT) -c $< .cc.lo: $(LTCXXCOMPILE) -c $< d17 11 @ 1.4 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3.2.1 2002/08/25 21:21:53 jlam Exp $ @ 1.3 log @add missing patch (forgot to cvs add). Thanks Thomas! @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @file patch-ab was added on branch buildlink2 on 2002-08-25 21:21:53 +0000 @ text @d1 46 @ 1.3.2.2 log @Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. @ text @a0 46 $NetBSD: patch-ab,v 1.3.2.1 2002/08/25 21:21:53 jlam Exp $ --- src/Makefile.in.orig Sat Apr 20 06:11:45 2002 +++ src/Makefile.in @@@@ -152,6 +152,10 @@@@ fluxbox_LDADD = $(LDADD) fluxbox_DEPENDENCIES = fluxbox_LDFLAGS = CXXFLAGS = @@CXXFLAGS@@ +CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) +CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) +CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) +LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@@@ -171,9 +175,12 @@@@ GZIP_ENV = --best SOURCES = $(fluxbox_SOURCES) OBJECTS = $(fluxbox_OBJECTS) +Image.o: Image.C +Image.lo: Image.C + all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .cc .lo .o .obj .s +.SUFFIXES: .S .c .cc .C .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile @@@@ -254,10 +261,16 @@@@ maintainer-clean-libtool: fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES) @@rm -f fluxbox$(EXEEXT) $(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS) +.cc.C: + cp -f $< $@@ +.C.o: + $(CXXCOMPILE_NOOPT) -c $< .cc.o: $(CXXCOMPILE) -c $< .cc.obj: $(CXXCOMPILE) -c `cygpath -w $<` +.C.lo: + $(LTCXXCOMPILE_NOOPT) -c $< .cc.lo: $(LTCXXCOMPILE) -c $< @ 1.2 log @Update to 0.1.8 from pkg/16440. Changes: Lots of bugfixes, code cleanup, new features. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2002/01/04 02:05:33 jmcneill Exp $ d3 43 a45 7 --- src/misc.cc.orig Thu Dec 27 04:05:34 2001 +++ src/misc.cc Thu Dec 27 04:02:59 2001 @@@@ -390,8 +390,10 @@@@ void DrawString(Display *display, Window w, GC gc, FFont *font, unsigned int text_w, unsigned int size_w, unsigned int bevel_w, char *text) { -//Draw title string a46 17 + if (!text || text_w<1 || size_w < 1 || !font || !display) + return; + unsigned int l = text_w; int dlen=strlen(text); int dx=bevel_w*2; @@@@ -446,7 +448,9 @@@@ unsigned int align, unsigned int text_w, unsigned int size_w, unsigned int size_h, unsigned int bevel_w, char *text) { - + if (!text || text_w<1 || size_w < 1 || !font || !display) + return; + unsigned int l = text_w; int dlen = strlen(text); int dx = bevel_w * 2; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Import fluxbox 0.1.5, a Window Manager for X based on BlackBox @ text @@