diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | CHANGELOG | 273 | ||||
| -rw-r--r-- | Makefile.am | 98 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | obrender/Makefile (renamed from render/Makefile) | 0 | ||||
| -rw-r--r-- | obrender/color.c (renamed from render/color.c) | 0 | ||||
| -rw-r--r-- | obrender/color.h (renamed from render/color.h) | 0 | ||||
| -rw-r--r-- | obrender/font.c (renamed from render/font.c) | 0 | ||||
| -rw-r--r-- | obrender/font.h (renamed from render/font.h) | 0 | ||||
| -rw-r--r-- | obrender/geom.h (renamed from render/geom.h) | 0 | ||||
| -rw-r--r-- | obrender/gradient.c (renamed from render/gradient.c) | 0 | ||||
| -rw-r--r-- | obrender/gradient.h (renamed from render/gradient.h) | 0 | ||||
| -rw-r--r-- | obrender/icon.h (renamed from render/icon.h) | 0 | ||||
| -rw-r--r-- | obrender/image.c (renamed from render/image.c) | 0 | ||||
| -rw-r--r-- | obrender/image.h (renamed from render/image.h) | 0 | ||||
| -rw-r--r-- | obrender/imagecache.c (renamed from render/imagecache.c) | 0 | ||||
| -rw-r--r-- | obrender/imagecache.h (renamed from render/imagecache.h) | 0 | ||||
| -rw-r--r-- | obrender/instance.c (renamed from render/instance.c) | 0 | ||||
| -rw-r--r-- | obrender/instance.h (renamed from render/instance.h) | 0 | ||||
| -rw-r--r-- | obrender/mask.c (renamed from render/mask.c) | 0 | ||||
| -rw-r--r-- | obrender/mask.h (renamed from render/mask.h) | 0 | ||||
| -rw-r--r-- | obrender/obrender-3.5.pc.in (renamed from render/obrender-4.0.pc.in) | 2 | ||||
| -rw-r--r-- | obrender/render.c (renamed from render/render.c) | 0 | ||||
| -rw-r--r-- | obrender/render.h (renamed from render/render.h) | 6 | ||||
| -rw-r--r-- | obrender/test.c (renamed from render/test.c) | 0 | ||||
| -rw-r--r-- | obrender/theme.c (renamed from render/theme.c) | 0 | ||||
| -rw-r--r-- | obrender/theme.h (renamed from render/theme.h) | 0 | ||||
| -rw-r--r-- | obrender/version.h.in (renamed from render/version.h.in) | 0 | ||||
| -rw-r--r-- | obt/obt-3.5.pc.in (renamed from obt/obt-4.0.pc.in) | 0 | ||||
| -rw-r--r-- | openbox/client.c | 2 | ||||
| -rw-r--r-- | openbox/client.h | 2 | ||||
| -rw-r--r-- | openbox/config.h | 2 | ||||
| -rw-r--r-- | openbox/dock.c | 2 | ||||
| -rw-r--r-- | openbox/dock.h | 2 | ||||
| -rw-r--r-- | openbox/focus_cycle_indicator.c | 2 | ||||
| -rw-r--r-- | openbox/focus_cycle_popup.c | 2 | ||||
| -rw-r--r-- | openbox/frame.c | 2 | ||||
| -rw-r--r-- | openbox/frame.h | 2 | ||||
| -rw-r--r-- | openbox/framerender.c | 2 | ||||
| -rw-r--r-- | openbox/menu.h | 2 | ||||
| -rw-r--r-- | openbox/menuframe.c | 2 | ||||
| -rw-r--r-- | openbox/menuframe.h | 2 | ||||
| -rw-r--r-- | openbox/moveresize.c | 4 | ||||
| -rw-r--r-- | openbox/openbox.c | 4 | ||||
| -rw-r--r-- | openbox/openbox.h | 4 | ||||
| -rw-r--r-- | openbox/popup.c | 4 | ||||
| -rw-r--r-- | openbox/popup.h | 2 | ||||
| -rw-r--r-- | openbox/prompt.h | 2 | ||||
| -rw-r--r-- | openbox/screen.c | 2 |
49 files changed, 361 insertions, 88 deletions
@@ -48,8 +48,8 @@ po/en@boldquot.insert-header po/en@quot.insert-header po/remove-potcdate.sed *.gmo -render/obrender-4.0.pc -obt/obt-4.0.pc +obrender/obrender-3.5.pc +obt/obt-3.5.pc tools/gnome-panel-control/gnome-panel-control tools/gdm-control/gdm-control tools/obxprop/obxprop @@ -1,3 +1,276 @@ +3.5.0-rc1: + +3.4.9: + * Allow focus to move while inside an Openbox menu, or during an interactive + action such as window cycling. + * Fixed bug #3717 (Empty dock interfered with move/grow to edge actions). + * Fixed bug #4411 (Crash when switching desktops and window cycling). + * Fixed bug #4377 (Window resistance against struts). + * Fixed bug #4035 (Prevent focus from moving under the mouse after + activating a window with an Openbox menu. + * Correct the value provided by the _NET_WORKAREA hint, so desktop icons + will place across all monitors. + * Don't hide submenus immediately when moving through the parent menu. + (Resolves request #3762). + * Fix for showing Openbox menus with multiple monitors, don't restrict them + to the monitor where the mouse is. + * Fixed bug #4023 (Allow the user to have multiple keys which perform the + same function in Openbox menus/move/resize. E.g. two keys which are + both bound to Escape. + * Add a new obprop tool, which can be used to read the _OB_ROLE, _OB_NAME, + and _OB_CLASS (as well as any other UTF-8 window properties) off of a + window. + * Add _OB_ROLE, _OB_NAME, and _OB_CLASS hints on each window that show the + respective values for use in the rc.xml applications section, to modify + the window when it appears. + * Improve Openbox interoperability with gnome-session >= 2.24. + * Fixed bug #4040 (Remove desktop hints set by gdm in the openbox-session + scripts, so that Openbox can set the number of desktops (assuming + gnome-settings-daemon doesn't first)). + * Fix a bug in xdg-autostart preventing some .desktop files from working. + * Show the desktop pager popup on the primary monitor instead of on all + monitors. + * Add a new primaryMonitor config option, which is where Openbox popups + will appear. Defaults to a fixed monitor, but can be made to behave as + before with the "active" value for it. + * Correct edge detection for move/grow to edge to properly use monitor edges + for multi-monitor setups. + * Change default window placement policy to stay on the active monitor for + multi-monitor setups. + * Fixed bug #1149 (Crash with some window icon sizes). + * Respond to all strut changes, fixes moving/hiding panels. + * Fix internal code to focus windows on other desktops correctly (Fixes + bug #4413). + * Focus correctness fixups for switching desktops. + * Fixed bug #4373 (Decoration bug for shaded maximized windows). + * Fixed bug #4350 (Allow a window to be made skip_taskbar but still get + focused by the user's rc.xml). + * Fixed bug #4307 (Set a minimum time for screenEdgeWarpTime). + * Fixed bug #4253 (Support for Solaris in openbox-session scripts). + * Fixed bug #3851 (Allow transient windows to be above helper windows). + +3.4.8: + * Updated translations: Slovak. + * Allow windows to change their decorations at any time (Fix for + Google Chrome). + * Make openbox-session to respect the $XDG_CONFIG_HOME environment variable. + * Fixed bug #4344 where borders were given to windows that should not have + them. + * Merge the SessionLogout and Exit actions. They now test if connected to a + session manager and ask it to exit if so, or simply kill Openbox if not. + * Further tweaks to the _NET_ACTIVE_WINDOW message handling. Use the same + logic for focus-stealing as is used when mapping a new window. + * Don't go out of our way any more to prevent focus from moving while the + keyboard is grabbed. + * Fix openbox-gnome-session when using gnome-session > 2.22. + +3.4.8-rc2: + * Updated translations: Italian, Croatian, Ukrainian. + * When resizing a window while focus cycling with bar=no, the bar no longer + reappears. + * Correctly handle shaped windows using the ShapeInput kind, this is used + by many composited apps to pass through clicks in their transparent areas. + * Fix the <monitor> per-app setting. + * Avoid using anonymous unions. + * Windows that had their decorations removed by per-app settings were still + placed as if they still had their decorations. + * Fix event handling not to ignore events on a window when they have an unmap + event in the queue, if that unmap event doesn't cause the window to be + unmanaged. + * Show the desktop switch on every monitor in xinerama. + * Fix interpretation of struts in xinerama where the screens have different + sizes. + * Add "next" and "prev" as possible <monitor> targets in the moveto and + resizeto actions. + * Allow escaping the _ used to mark the shortcut character in menu labels. + You can now change the (first) _ in a label to __, this will be displayed + as a single underscore. The rest of the _ in the string will be unaffected, + so only double the first one. + * Only replace ~ with the home directory when it is preceded by whitespace or + is at the start of the string, and when it is followed by a space, slash, or + the end of the string. This is implemented with GRegex, and so the required + glib version has been bumped to 2.14. + * Some other small fixes. + +3.4.8-rc1: + * Updated translations: Basque, Catalan, Turkish, Italian, Spanish, Russian. + * New translations: Danish, Turkish, Lithuanian. + * Set the _MOTIF_WM_INFO atom so urxvt uses motif hints for borderless mode. + * Properly escape the xml used in session files. + * Correct a 64-bit issue related to comparing timestamps. + * There is a sneaky sentence right at the end of a big paragraph in the + wm-spec document that says windows mapping with _NET_WM_USER_TIME=0 should + not be focused initially, honor this request. + * When moving a window to another desktop with following on, bring the + window's helper windows (for example gimp image windows with the toolbox + set to utility window). + * Change the _NET_ACTIVE_WINDOW messages again, if they originate from the + app and the window is on another desktop, just set the demands_attention + flag. If the event came from the user (ie pager/panel), then the window + is still moved to the current desktop. + +3.4.7.2: + * The system I used to generate the dist tarball didn't have the + docbook-to-man command so the manpages were empty. + +3.4.7.1: + * Not to be outdone by the cairo team, I introduced a bug in the last release + which made resizing not give any feedback. This is now fixed. + +3.4.7: + * Fully updated Czech, Simplified Chinese, Traditional Chinese, German, + French, Hungarian, Norwegian, Vietnamese, Dutch, Swedish, Finnish, + Brazilian Portuguese, Japanese and Portuguese translations + * Partially updated Spanish translation + * Add an example of the "force" option for the per-app placement options to + the default rc.xml file + * Add a new xdg-autostart script. This will eventually end up in the PyXDG + distribution hopefully, but it is included in Openbox for now. This script + runs things based on the freedesktop.org autostart specification. You can + have it run GNOME, KDE, ROX, or XFCE specific things if you want. The + new default system-wide autostart.sh script runs it automatically + * Update the default menu.xml to include a lot of common apps + * Fix white font shadows (negative shadowtint) + * Update the autostart.sh to find gnome-settings-daemon correctly, as the + GNOME people have moved it to libexec + * Fix focus possibly getting stolen when using the Focus action + * Drastically speed up rendering of Vertical and SplitVertical gradients + * Speed improvements also for Horizonal and Pyramid gradients + * Add new theme options, menu.overlap.x and menu.overlap.y options, that let + you independently control the horizontal and vertical position of submenus + * Change _NET_ACTIVE_WINDOW messages to not change the current desktop, but + to bring the window to the current desktop instead. This is the industry + standard policy + * Use the pretty new openbox.png icon as the default window icon + * Allow matching per-application rules to windows by their window type + (normal, dialog, splash, etc). The default rc.xml has more details + * Add new Openbox-themed prompt windows. Use these prompt windows to ask + before killing off windows that aren't responding. This also means we + don't need to ping every window constantly forever + * Add a new <prompt> option to the Execute action. If this is set to a + string, a dialog will be shown with that string in it and "yes"/"no" + buttons. The command to be executed will only be run if the user selects + "yes" in the dialog + * Add a new <prompt> option to the Exit action, which is a boolean (not a + string). When true, Openbox will show a dialog confirming if you want to + exit. The default is to show the prompt + * Reduce Openbox's memory footprint and speed up rendering through the use + of a new icon cache, so that Openbox only needs to keep 1 copy of an icon + when 100 different windows share it + * Make Openbox menus have the "menu type" hint for compositors to see and use + * Fix the MoveResizeTo action for negative coords (opposite edges) + * Fix key bindings getting lost if multiple bindings at the same level could + not be translated (Fixes VMWare causing Openbox keybindings to stop + working) + * Fix the resize popup box for terminal windows with a base size of 0 (show + the right size values for urxvt terminals) + * Fix some off-by-one bugs with the edge growing/shrinking code + * Add new theme options for menu line separators: menu.separator.color, + menu.separator.width, menu.separator.padding.width, + menu.separator.padding.height + * Add xfce-mcs-manager to the default autostart.sh, and run it automatically + when gnome-settings-daemon is not present to have GTK apps inherit settings + from the XFCE configuration tools + * Make the send-to-desktop menu in the client-menu indicate which is the current + desktop for omnipresent windows, and don't close it if just toggling + omni-presence when ctrl-clicking + * Add a new SessionLogout action that logs out through the session manager, + when running Openbox within a session manager such as within an + GNOME/Openbox or KDE/Openbox session. The action includes a <prompt> + option which is similar to the Exit action's + * Add a new gdm-control command that lets you control gdm from within an X + session. The gdm-control lets you change GDM's behaviour for when you end + the current session. For instance, you can tell GDM to reboot, and + then immediately log out of the current session, and the computer will be + rebooted + * Show an information dialog when an error occurs for Openbox, such as when + the Execute action fails or when XML syntax errors are present in the + configuration files + * When making a window very narrow, don't draw buttons to the right of the title + on top of the ones on its left. + +3.4.6.1: + * Updated Clearlooks theme + * Add the force="yes/no" option for the per-app settings' <position> tag + * Raise and focus modal children and their direct parents together, improved + usability with direct modal transient windows + * Fix crash when using <raise> for NextWindow and there are no windows + to move focus to + * Add the <manageDesktops> option in the rc.xml <menu> section, which toggles + the "Manage Desktops" section appearing in the combined-client-list-menu + * Fix for menu headers showing the wrong text + * Fix for the <focusLast> behavior + * Treat modal direct children as one window with their parent consistently + +3.4.6: + * Added Basque translation + * Updated French, Vietnamese German, Simplified Chinese, Russian, Portuguese, + Brasilian Portuguese, Norwegian, and Finnish translations + * New Clearlooks theme, updated by David Barr + * Updated the previous Clearlooks theme, and renamed it to Clearlooks-3.4 + * Allow dialog type windows to go fullscreen (Fixes Kpdf) + * Remove the extraneous top border for undecorated windows while maximized + * Fixes for keyboard modifiers (Alt-tab dialog getting stuck on screen for + some users) + * Automatically catch changes to the keyboard map and reconfigure the key + bindings on the fly + * Fix focus moving incorrectly sometimes with focus under mouse enabled + * Make default configuration focus the desktop when you right click + * Add the <bar> and <raise> options for all window cycling actions, allowing + you to have your target window temporarily raised above all others, and to + turn the focus target indicator bar off + * Improve the LastDesktop action to not remember desktops you skipped across + * Ignore mouse clicks that are made on override-redirect (unmanaged) windows + * When opening a menu with a key binding, don't use the key binding to run + something in the menu + * Add a <monitor> option for window placement, which gives you the option + to place new windows on the active monitor, or the monitor where the mouse + is, instead of on any monitor (for xinerama multihead setups) + * Add options for placing the window move/resize coordinate popup window in + a fixed position on screen, rather than relative to the window being + moved or resized + * Prevent the dock from auto-hiding completely offscreen if the theme has + no borders for it + * New icon + * Fix race condition when running things that want to grab the keyboard + (e.g. gnome-panel-control --main-menu) + * When dialog windows ask to not appear in the taskbar, still give them focus + in normal ways (fixes new GNOME session logout dialogs) + * Fix bug with resizing corners on certain parts of the window frame + * Ping applications to tell when they are running or have become frozen. + Show a [Not Responding] message in the title bar of windows which are + frozen. + * When closing a window which is [Not Responding], kill the window's process + if it is running on the same machine as Openbox. Otherwise, just + disconnect + the window from the X display. A second attempt to close a [Not + Responding] + window will kill it forcefully (kill -9). + * Fixes for internal timers + * Add a <wmclass> option for the execute action's startup-notification. This + lets you tell Openbox that the application will map a window with the + specified class - for applications that do not support startup-notification + natively. + * Fix for empty dock taking up space onscreen after a reconfigure + * Reduce Openbox's additional memory footprint per-window and per-menu + * Faster horizontal gradient rendering + * Don't deiconify windows that aren't allowed to be directly iconified on + restart (eg toolbars), as they can be iconified by other means + * Improve support for fullscreen windows in xinerama (TwinView) and + multiple-screen setups + * Add a --config-file command line option, to specify an alternate + configuration file path + +3.4.5: + * Added Hungarian translation + * Updated Finnish, Russian, German and French translations + * Fixed some very minor memory leaks + * Hide the desktop popup when showing the focus popup + * Fix a crash when trying to access the More... menu of + client-list-combined-menu + * Fix the coordinate popup only showing up on the first monitor in xinerama + * Add --exit to exit the currently running openbox instance + 3.4.4: * Updated Traditional Chinese translation * Updated Norwegian translation diff --git a/Makefile.am b/Makefile.am index 3934b62f..0bcb8b28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt -rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox secretbindir = $(libdir)/openbox @@ -24,11 +24,11 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. check_PROGRAMS = \ - render/rendertest + obrender/rendertest lib_LTLIBRARIES = \ obt/libobt.la \ - render/libobrender.la + obrender/libobrender.la bin_PROGRAMS = \ openbox/openbox \ @@ -44,58 +44,58 @@ nodist_bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session -## render ## +## obrender ## -render_rendertest_CPPFLAGS = \ +obrender_rendertest_CPPFLAGS = \ $(PANGO_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" -render_rendertest_LDADD = \ +obrender_rendertest_LDADD = \ obt/libobt.la \ - render/libobrender.la \ + obrender/libobrender.la \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ $(XML_LIBS) \ $(X_LIBS) -render_rendertest_SOURCES = render/test.c +obrender_rendertest_SOURCES = obrender/test.c -render_libobrender_la_CPPFLAGS = \ +obrender_libobrender_la_CPPFLAGS = \ $(X_CFLAGS) \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" -render_libobrender_la_LDFLAGS = \ +obrender_libobrender_la_LDFLAGS = \ -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE) -render_libobrender_la_LIBADD = \ +obrender_libobrender_la_LIBADD = \ obt/libobt.la \ $(X_LIBS) \ $(PANGO_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) -render_libobrender_la_SOURCES = \ +obrender_libobrender_la_SOURCES = \ gettext.h \ - render/color.h \ - render/color.c \ - render/font.h \ - render/font.c \ - render/geom.h \ - render/gradient.h \ - render/gradient.c \ - render/icon.h \ - render/image.h \ - render/image.c \ - render/imagecache.h \ - render/imagecache.c \ - render/instance.h \ - render/instance.c \ - render/mask.h \ - render/mask.c \ - render/render.h \ - render/render.c \ - render/theme.h \ - render/theme.c + obrender/color.h \ + obrender/color.c \ + obrender/font.h \ + obrender/font.c \ + obrender/geom.h \ + obrender/gradient.h \ + obrender/gradient.c \ + obrender/icon.h \ + obrender/image.h \ + obrender/image.c \ + obrender/imagecache.h \ + obrender/imagecache.c \ + obrender/instance.h \ + obrender/instance.c \ + obrender/mask.h \ + obrender/mask.c \ + obrender/render.h \ + obrender/render.c \ + obrender/theme.h \ + obrender/theme.c ## obt ## @@ -163,7 +163,7 @@ openbox_openbox_LDADD = \ $(XML_LIBS) \ $(EFENCE_LIBS) \ $(LIBINTL) \ - render/libobrender.la \ + obrender/libobrender.la \ obt/libobt.la openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ @@ -408,16 +408,16 @@ dist_syscrash_theme_DATA= \ ## public headers ## rrpubinclude_HEADERS = \ - render/color.h \ - render/font.h \ - render/geom.h \ - render/gradient.h \ - render/image.h \ - render/instance.h \ - render/mask.h \ - render/render.h \ - render/theme.h \ - render/version.h + obrender/color.h \ + obrender/font.h \ + obrender/geom.h \ + obrender/gradient.h \ + obrender/image.h \ + obrender/instance.h \ + obrender/mask.h \ + obrender/render.h \ + obrender/theme.h \ + obrender/version.h obtpubinclude_HEADERS = \ obt/display.h \ @@ -431,8 +431,8 @@ obtpubinclude_HEADERS = \ obt/xevent.h nodist_pkgconfig_DATA = \ - render/obrender-4.0.pc \ - obt/obt-4.0.pc + obrender/obrender-3.5.pc \ + obt/obt-3.5.pc ## data ## @@ -501,9 +501,9 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/version.h.in \ - render/obrender-4.0.pc.in \ - obt/obt-4.0.pc.in \ + obrender/version.h.in \ + obrender/obrender-3.5.pc.in \ + obt/obt-3.5.pc.in \ obt/version.h.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ @@ -560,7 +560,7 @@ CLEANFILES = \ # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc distclean-local: - for d in . m4 po render parser obt openbox; do \ + for d in . m4 po obrender parser obt openbox; do \ for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \ rm -f "$$d/$$p"; \ done \ diff --git a/configure.ac b/configure.ac index 78d0753e..379440a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.999.0], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.5.0-rc1], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) @@ -13,15 +13,15 @@ dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0. dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl -RR_MAJOR_VERSION=4 -RR_MINOR_VERSION=0 -RR_MICRO_VERSION=17 +RR_MAJOR_VERSION=3 +RR_MINOR_VERSION=5 +RR_MICRO_VERSION=27 RR_INTERFACE_AGE=0 RR_BINARY_AGE=0 RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION -OBT_MAJOR_VERSION=4 -OBT_MINOR_VERSION=0 +OBT_MAJOR_VERSION=3 +OBT_MINOR_VERSION=5 OBT_MICRO_VERSION=0 OBT_INTERFACE_AGE=0 OBT_BINARY_AGE=0 @@ -174,9 +174,9 @@ AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in - render/obrender-4.0.pc - obt/obt-4.0.pc - render/version.h + obrender/obrender-3.5.pc + obt/obt-3.5.pc + obrender/version.h obt/version.h ]) AC_CONFIG_COMMANDS([doc], diff --git a/render/Makefile b/obrender/Makefile index b90edacf..b90edacf 100644 --- a/render/Makefile +++ b/obrender/Makefile diff --git a/render/color.c b/obrender/color.c index 5e3f2169..5e3f2169 100644 --- a/render/color.c +++ b/obrender/color.c diff --git a/render/color.h b/obrender/color.h index 26fa7afe..26fa7afe 100644 --- a/render/color.h +++ b/obrender/color.h diff --git a/render/font.c b/obrender/font.c index cde0d030..cde0d030 100644 --- a/render/font.c +++ b/obrender/font.c diff --git a/render/font.h b/obrender/font.h index 07d648d1..07d648d1 100644 --- a/render/font.h +++ b/obrender/font.h diff --git a/render/geom.h b/obrender/geom.h index 4d81e4b3..4d81e4b3 100644 --- a/render/geom.h +++ b/obrender/geom.h diff --git a/render/gradient.c b/obrender/gradient.c index 60a0a555..60a0a555 100644 --- a/render/gradient.c +++ b/obrender/gradient.c diff --git a/render/gradient.h b/obrender/gradient.h index 8613f0ce..8613f0ce 100644 --- a/render/gradient.h +++ b/obrender/gradient.h diff --git a/render/icon.h b/obrender/icon.h index f0b2d267..f0b2d267 100644 --- a/render/icon.h +++ b/obrender/icon.h diff --git a/render/image.c b/obrender/image.c index 924504fd..924504fd 100644 --- a/render/image.c +++ b/obrender/image.c diff --git a/render/image.h b/obrender/image.h index b478daf9..b478daf9 100644 --- a/render/image.h +++ b/obrender/image.h diff --git a/render/imagecache.c b/obrender/imagecache.c index 9c605f9d..9c605f9d 100644 --- a/render/imagecache.c +++ b/obrender/imagecache.c diff --git a/render/imagecache.h b/obrender/imagecache.h index 4ad2deae..4ad2deae 100644 --- a/render/imagecache.h +++ b/obrender/imagecache.h diff --git a/render/instance.c b/obrender/instance.c index b867815c..b867815c 100644 --- a/render/instance.c +++ b/obrender/instance.c diff --git a/render/instance.h b/obrender/instance.h index 324f061a..324f061a 100644 --- a/render/instance.h +++ b/obrender/instance.h diff --git a/render/mask.c b/obrender/mask.c index b6e3c443..b6e3c443 100644 --- a/render/mask.c +++ b/obrender/mask.c diff --git a/render/mask.h b/obrender/mask.h index 4dc85031..4dc85031 100644 --- a/render/mask.h +++ b/obrender/mask.h diff --git a/render/obrender-4.0.pc.in b/obrender/obrender-3.5.pc.in index 539606a4..78646e32 100644 --- a/render/obrender-4.0.pc.in +++ b/obrender/obrender-3.5.pc.in @@ -9,6 +9,6 @@ xlibs=@X_LIBS@ Name: ObRender Description: Openbox Render Library Version: @RR_VERSION@ -Requires: obt-4.0 glib-2.0 xft pangoxft +Requires: obt-3.5 glib-2.0 xft pangoxft Libs: -L${libdir} -lobrender ${xlibs} Cflags: -I${includedir}/openbox/@RR_VERSION@ ${xcflags} diff --git a/render/render.c b/obrender/render.c index 20002e32..20002e32 100644 --- a/render/render.c +++ b/obrender/render.c diff --git a/render/render.h b/obrender/render.h index 706843e3..7bea1b54 100644 --- a/render/render.h +++ b/obrender/render.h @@ -21,15 +21,15 @@ #ifndef __render_h #define __render_h -#include "geom.h" -#include "render/version.h" - #include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */ #include <pango/pangoxft.h> #include <glib.h> G_BEGIN_DECLS +#include "obrender/geom.h" +#include "obrender/version.h" + typedef union _RrTextureData RrTextureData; typedef struct _RrAppearance RrAppearance; typedef struct _RrSurface RrSurface; diff --git a/render/test.c b/obrender/test.c index 55ab621e..55ab621e 100644 --- a/render/test.c +++ b/obrender/test.c diff --git a/render/theme.c b/obrender/theme.c index 6c136bf5..6c136bf5 100644 --- a/render/theme.c +++ b/obrender/theme.c diff --git a/render/theme.h b/obrender/theme.h index 3f9063e6..3f9063e6 100644 --- a/render/theme.h +++ b/obrender/theme.h diff --git a/render/version.h.in b/obrender/version.h.in index 0ff30b57..0ff30b57 100644 --- a/render/version.h.in +++ b/obrender/version.h.in diff --git a/obt/obt-4.0.pc.in b/obt/obt-3.5.pc.in index 840de161..840de161 100644 --- a/obt/obt-4.0.pc.in +++ b/obt/obt-3.5.pc.in diff --git a/openbox/client.c b/openbox/client.c index 184ae171..4d8f4e77 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -38,7 +38,7 @@ #include "menuframe.h" #include "keyboard.h" #include "mouse.h" -#include "render/render.h" +#include "obrender/render.h" #include "gettext.h" #include "obt/display.h" #include "obt/prop.h" diff --git a/openbox/client.h b/openbox/client.h index 8126abe2..a361e367 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -25,7 +25,7 @@ #include "geom.h" #include "stacking.h" #include "window.h" -#include "render/color.h" +#include "obrender/color.h" #include <glib.h> #include <X11/Xlib.h> diff --git a/openbox/config.h b/openbox/config.h index 11796dcb..5c18ad3a 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -26,7 +26,7 @@ #include "client.h" #include "geom.h" #include "moveresize.h" -#include "render/render.h" +#include "obrender/render.h" #include "obt/parse.h" #include <glib.h> diff --git a/openbox/dock.c b/openbox/dock.c index ce2dafb8..d1f6b294 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -23,7 +23,7 @@ #include "config.h" #include "grab.h" #include "openbox.h" -#include "render/theme.h" +#include "obrender/theme.h" #include "obt/prop.h" #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \ diff --git a/openbox/dock.h b/openbox/dock.h index 3463f27b..8bc735ee 100644 --- a/openbox/dock.h +++ b/openbox/dock.h @@ -22,7 +22,7 @@ #include "window.h" #include "stacking.h" #include "geom.h" -#include "render/render.h" +#include "obrender/render.h" #include <glib.h> #include <X11/Xlib.h> diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c index 5d7ecb3d..89527903 100644 --- a/openbox/focus_cycle_indicator.c +++ b/openbox/focus_cycle_indicator.c @@ -23,7 +23,7 @@ #include "openbox.h" #include "frame.h" #include "event.h" -#include "render/render.h" +#include "obrender/render.h" #include <X11/Xlib.h> #include <glib.h> diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 0f9bd752..4f697fdd 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -26,7 +26,7 @@ #include "config.h" #include "window.h" #include "event.h" -#include "render/render.h" +#include "obrender/render.h" #include <X11/Xlib.h> #include <glib.h> diff --git a/openbox/frame.c b/openbox/frame.c index 6387d7ef..084f3f6a 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -28,7 +28,7 @@ #include "focus_cycle_indicator.h" #include "moveresize.h" #include "screen.h" -#include "render/theme.h" +#include "obrender/theme.h" #include "obt/display.h" #include "obt/prop.h" diff --git a/openbox/frame.h b/openbox/frame.h index 8687381d..1130709b 100644 --- a/openbox/frame.h +++ b/openbox/frame.h @@ -21,7 +21,7 @@ #define __frame_h #include "geom.h" -#include "render/render.h" +#include "obrender/render.h" typedef struct _ObFrame ObFrame; diff --git a/openbox/framerender.c b/openbox/framerender.c index bf71d2c3..28c12ae2 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -22,7 +22,7 @@ #include "screen.h" #include "client.h" #include "framerender.h" -#include "render/theme.h" +#include "obrender/theme.h" static void framerender_label(ObFrame *self, RrAppearance *a); static void framerender_icon(ObFrame *self, RrAppearance *a); diff --git a/openbox/menu.h b/openbox/menu.h index 43efd413..16cf4291 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -21,7 +21,7 @@ #include "window.h" #include "geom.h" -#include "render/render.h" +#include "obrender/render.h" #include <glib.h> diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 999dddf1..ee374de5 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -27,7 +27,7 @@ #include "openbox.h" #include "config.h" #include "obt/prop.h" -#include "render/theme.h" +#include "obrender/theme.h" #define PADDING 2 #define MAX_MENU_WIDTH 400 diff --git a/openbox/menuframe.h b/openbox/menuframe.h index f6a7b30e..87a718e7 100644 --- a/openbox/menuframe.h +++ b/openbox/menuframe.h @@ -22,7 +22,7 @@ #include "geom.h" #include "window.h" -#include "render/render.h" +#include "obrender/render.h" #include <glib.h> diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 5db79f9f..99222577 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -29,8 +29,8 @@ #include "config.h" #include "event.h" #include "debug.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" #include "obt/display.h" #include "obt/prop.h" #include "obt/keyboard.h" diff --git a/openbox/openbox.c b/openbox/openbox.c index 5f926bb6..c597d23f 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -43,8 +43,8 @@ #include "ping.h" #include "prompt.h" #include "gettext.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" #include "obt/display.h" #include "obt/prop.h" #include "obt/keyboard.h" diff --git a/openbox/openbox.h b/openbox/openbox.h index b0529219..c43f0a61 100644 --- a/openbox/openbox.h +++ b/openbox/openbox.h @@ -21,8 +21,8 @@ #include "misc.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" #include "obt/mainloop.h" #include "obt/display.h" diff --git a/openbox/popup.c b/openbox/popup.c index a4192819..90ec32de 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -25,8 +25,8 @@ #include "stacking.h" #include "event.h" #include "screen.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" ObPopup *popup_new(void) { diff --git a/openbox/popup.h b/openbox/popup.h index 503e2773..f876e3ce 100644 --- a/openbox/popup.h +++ b/openbox/popup.h @@ -20,7 +20,7 @@ #define __popup_h #include "window.h" -#include "render/render.h" +#include "obrender/render.h" #include <glib.h> struct _ObClientIcon; diff --git a/openbox/prompt.h b/openbox/prompt.h index d07793a9..0d7cfef8 100644 --- a/openbox/prompt.h +++ b/openbox/prompt.h @@ -21,7 +21,7 @@ #include "window.h" #include "geom.h" -#include "render/render.h" +#include "obrender/render.h" #include <glib.h> #include <X11/Xlib.h> diff --git a/openbox/screen.c b/openbox/screen.c index bb98e084..bce2faaf 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -32,7 +32,7 @@ #include "focus.h" #include "focus_cycle.h" #include "popup.h" -#include "render/render.h" +#include "obrender/render.h" #include "gettext.h" #include "obt/display.h" #include "obt/prop.h" |