Merge branch 'backport' into work

diff --combined .gitignore
index d48a7c37e1315d2606e7f78415b6bf4659e37460,bac98c7e7d8c8fc9200609c137c409c464956d99..3e0eac02e5b4a233637f5b721b108d36494c98e7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -22,6 -22,7 +22,7 @@@ doc/openbox-gnome-session.
  doc/openbox-kde-session.1
  doc/openbox-session.1
  doc/openbox.1
+ doc/obxprop.1
  libtool
  ltmain.sh
  m4/*.m4
@@@ -32,7 -33,7 +33,7 @@@
  missing
  .dirstamp
  openbox/openbox
 -parser/obparser-3.0.pc
 +parser/obparser-4.0.pc
  po/Makefile.in.in
  po/Makevars.template
  po/POTFILES
@@@ -48,8 -49,7 +49,8 @@@ po/en@boldquot.insert-heade
  po/en@quot.insert-header
  po/remove-potcdate.sed
  *.gmo
 -render/obrender-3.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
@@@ -76,14 -76,11 +77,14 @@@ tests/grouptrancircular
  tests/iconifydelay
  tests/icons
  tests/mapiconic
 +tests/mingrow
  tests/modal
  tests/modal2
  tests/modal3
  tests/noresize
 +tests/oldfullscreen
  tests/override
 +tests/overrideinputonly
  tests/positioned
  tests/resize
  tests/restack

diff --combined Makefile.am
index 91b2303397f7c72f8daf0e1fb087b7deca506e69,0be0e3732fca25dd0158afb0571e456bb2494dd2..c60389af5a3a760a642451123d60bf1a537b6895
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -8,8 -8,7 +8,8 @@@ rcdir           = $(configdir)/openbo
  xsessionsdir    = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
  pkgconfigdir    = $(libdir)/pkgconfig
 -pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
  pixmapdir       = $(datadir)/pixmaps
  xsddir          = $(datadir)/openbox
  secretbindir    = $(libdir)/openbox
@@@ -24,11 -23,11 +24,11 @@@ ACLOCAL_AMFLAGS = -I m
  INCLUDES = -I.
  
  check_PROGRAMS = \
 -      render/rendertest
 +      obrender/rendertest
  
  lib_LTLIBRARIES = \
 -      parser/libobparser.la \
 -      render/libobrender.la
 +      obt/libobt.la \
 +      obrender/libobrender.la
  
  bin_PROGRAMS = \
        openbox/openbox \
@@@ -44,105 -43,90 +44,105 @@@ nodist_bin_SCRIPTS = 
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
  
 -## render ##
 +## obrender ##
  
 -render_rendertest_CPPFLAGS = \
 +obrender_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
 -      $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 -render_rendertest_LDADD = \
 -      parser/libobparser.la \
 -      render/libobrender.la \
 +obrender_rendertest_LDADD = \
 +      obt/libobt.la \
 +      obrender/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
 -      $(XFT_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) \
 -      $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 -render_libobrender_la_LDFLAGS = \
 -      -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 -render_libobrender_la_LIBADD = \
 -      parser/libobparser.la \
 +obrender_libobrender_la_LDFLAGS = \
 +      -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 +obrender_libobrender_la_LIBADD = \
 +      obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
 -      $(XFT_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
 -
 -## parser ##
 -
 -parser_libobparser_la_CPPFLAGS = \
 +      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 ##
 +
 +obt_libobt_la_CPPFLAGS = \
 +      $(XINERAMA_CFLAGS) \
 +      $(XKB_CFLAGS) \
 +      $(XRANDR_CFLAGS) \
 +      $(XSHAPE_CFLAGS) \
 +      $(XSYNC_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
 -      -DG_LOG_DOMAIN=\"ObParser\" \
 +      -DG_LOG_DOMAIN=\"Obt\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
 -parser_libobparser_la_LDFLAGS = \
 -      -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 -parser_libobparser_la_LIBADD = \
 +obt_libobt_la_LDFLAGS = \
 +      -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
 +obt_libobt_la_LIBADD = \
 +      $(XINERAMA_LIBS) \
 +      $(XKB_LIBS) \
 +      $(XRANDR_LIBS) \
 +      $(XSHAPE_LIBS) \
 +      $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
 -      $(XML_LIBS) 
 -parser_libobparser_la_SOURCES = \
 -      parser/parse.h \
 -      parser/parse.c
 +      $(XML_LIBS)
 +obt_libobt_la_SOURCES = \
 +      obt/display.h \
 +      obt/display.c \
 +      obt/internal.h \
 +      obt/keyboard.h \
 +      obt/keyboard.c \
 +      obt/mainloop.h \
 +      obt/mainloop.c \
 +      obt/xml.h \
 +      obt/xml.c \
 +      obt/paths.h \
 +      obt/paths.c \
 +      obt/prop.h \
 +      obt/prop.c \
 +      obt/util.h \
 +      obt/xevent.h \
 +      obt/xevent.c
  
  ## openbox ##
  
  openbox_openbox_CPPFLAGS = \
        $(SM_CFLAGS) \
 -      $(XINERAMA_CFLAGS) \
 -      $(XKB_CFLAGS) \
 -      $(XRANDR_CFLAGS) \
 -      $(XSHAPE_CFLAGS) \
 -      $(XSYNC_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
@@@ -150,13 -134,17 +150,13 @@@
        $(GLIB_CFLAGS) \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
 +      $(IMLIB2_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
  openbox_openbox_LDADD = \
        $(SM_LIBS) \
 -      $(XINERAMA_LIBS) \
 -      $(XKB_LIBS) \
 -      $(XRANDR_LIBS) \
 -      $(XSHAPE_LIBS) \
 -      $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
@@@ -164,9 -152,8 +164,9 @@@
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
 -      render/libobrender.la \
 -      parser/libobparser.la
 +      $(IMLIB2_LIBS) \
 +      obrender/libobrender.la \
 +      obt/libobt.la
  openbox_openbox_LDFLAGS = -export-dynamic
  openbox_openbox_SOURCES = \
        gettext.h \
@@@ -205,7 -192,6 +205,7 @@@
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
        openbox/actions/shade.c \
 +      openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.c \
@@@ -227,6 -213,8 +227,6 @@@
        openbox/dock.h \
        openbox/event.c \
        openbox/event.h \
 -      openbox/extensions.c \
 -      openbox/extensions.h \
        openbox/focus.c \
        openbox/focus.h \
        openbox/focus_cycle.c \
@@@ -248,11 -236,15 +248,11 @@@
        openbox/keyboard.h \
        openbox/keytree.c \
        openbox/keytree.h \
 -      openbox/mainloop.c \
 -      openbox/mainloop.h \
        openbox/menuframe.c \
        openbox/menuframe.h \
        openbox/menu.c \
        openbox/menu.h \
        openbox/misc.h \
 -      openbox/modkeys.c \
 -      openbox/modkeys.h \
        openbox/mouse.c \
        openbox/mouse.h \
        openbox/moveresize.c \
@@@ -268,6 -260,8 +268,6 @@@
        openbox/prompt.h \
        openbox/popup.c \
        openbox/popup.h \
 -      openbox/prop.c \
 -      openbox/prop.h \
        openbox/resist.c \
        openbox/resist.h \
        openbox/screen.c \
@@@ -281,7 -275,9 +281,7 @@@
        openbox/translate.c \
        openbox/translate.h \
        openbox/window.c \
 -      openbox/window.h \
 -      openbox/xerror.c \
 -      openbox/xerror.h
 +      openbox/window.h
  
  
  ## gnome-panel-control ##
@@@ -410,32 -406,24 +410,32 @@@ dist_syscrash_theme_DATA= 
  
  ## public headers ##
  
 -pubinclude_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 \
 -      parser/parse.h
 -
 -nodist_pubinclude_HEADERS = \
 -      version.h
 +rrpubinclude_HEADERS = \
 +      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 \
 +      obt/keyboard.h \
 +      obt/mainloop.h \
 +      obt/xml.h \
 +      obt/paths.h \
 +      obt/prop.h \
 +      obt/util.h \
 +      obt/version.h \
 +      obt/xevent.h
  
  nodist_pkgconfig_DATA = \
 -      render/obrender-3.0.pc \
 -      parser/obparser-3.0.pc
 +      obrender/obrender-3.5.pc \
 +      obt/obt-3.5.pc
  
  ## data ##
  
@@@ -487,6 -475,7 +487,6 @@@ nodist_xsessions_DATA = 
        data/xsession/openbox-kde.desktop
  
  dist_noinst_DATA = \
 -      version.h.in \
        data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
@@@ -506,10 -495,8 +506,10 @@@
        doc/openbox-kde-session.1.in \
        doc/obxprop.1.sgml \
        doc/obxprop.1.in \
 -      render/obrender-3.0.pc.in \
 -      parser/obparser-3.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 \
        tests/Makefile \
@@@ -542,7 -529,8 +542,8 @@@ nodist_man_MANS = 
        doc/openbox.1 \
        doc/openbox-session.1 \
        doc/openbox-gnome-session.1 \
-       doc/openbox-kde-session.1
+       doc/openbox-kde-session.1 \
+       doc/obxprop.1
  
  EXTRA_DIST = \
        config.rpath
@@@ -565,7 -553,7 +566,7 @@@ CLEANFILES = 
  #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
  
  distclean-local:
 -      for d in . m4 po render; 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 \