From: Dana Jansens <danakj@orodu.net>
Date: Mon, 14 Dec 2009 20:25:57 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=a93b00a5e93281c7c2c31112f0b6b827d605a19d;hp=-c

Merge branch 'backport' into work
---

a93b00a5e93281c7c2c31112f0b6b827d605a19d
diff --combined .gitignore
index 9e6bcb6b,3ea0363d..bc20413d
--- a/.gitignore
+++ b/.gitignore
@@@ -32,7 -32,7 +32,7 @@@ m4/*.m
  missing
  .dirstamp
  openbox/openbox
 -parser/obparser-3.0.pc
 +parser/obparser-4.0.pc
  po/Makefile.in.in
  po/Makevars.template
  po/POTFILES
@@@ -48,10 -48,10 +48,11 @@@ po/en@boldquot.insert-heade
  po/en@quot.insert-header
  po/remove-potcdate.sed
  *.gmo
 -render/obrender-3.0.pc
 +render/obrender-4.0.pc
 +obt/obt-4.0.pc
  tools/gnome-panel-control/gnome-panel-control
  tools/gdm-control/gdm-control
+ tools/obprop/obprop
  version.h
  .libs
  .deps
diff --combined Makefile.am
index 786b97b0,4b3e0b50..4384054a
--- a/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@/render
  pixmapdir       = $(datadir)/pixmaps
  xsddir          = $(datadir)/openbox
  secretbindir    = $(libdir)/openbox
@@@ -27,13 -26,14 +27,14 @@@ check_PROGRAMS = 
  	render/rendertest
  
  lib_LTLIBRARIES = \
 -	parser/libobparser.la \
 +	obt/libobt.la \
  	render/libobrender.la
  
  bin_PROGRAMS = \
  	openbox/openbox \
  	tools/gdm-control/gdm-control \
- 	tools/gnome-panel-control/gnome-panel-control
+ 	tools/gnome-panel-control/gnome-panel-control \
+ 	tools/obprop/obprop
  
  dist_secretbin_SCRIPTS = \
  	tools/xdg-autostart/xdg-autostart
@@@ -47,13 -47,15 +48,13 @@@ nodist_bin_SCRIPTS = 
  
  render_rendertest_CPPFLAGS = \
  	$(PANGO_CFLAGS) \
 -	$(XFT_CFLAGS) \
  	$(GLIB_CFLAGS) \
  	-DG_LOG_DOMAIN=\"RenderTest\"
  render_rendertest_LDADD = \
 -	parser/libobparser.la \
 +	obt/libobt.la \
  	render/libobrender.la \
  	$(GLIB_LIBS) \
  	$(PANGO_LIBS) \
 -	$(XFT_LIBS) \
  	$(XML_LIBS) \
  	$(X_LIBS)
  render_rendertest_SOURCES = render/test.c
@@@ -63,14 -65,16 +64,14 @@@ render_libobrender_la_CPPFLAGS = 
  	$(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)
 +	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
  render_libobrender_la_LIBADD = \
 -	parser/libobparser.la \
 +	obt/libobt.la \
  	$(X_LIBS) \
  	$(PANGO_LIBS) \
 -	$(XFT_LIBS) \
  	$(GLIB_LIBS) \
  	$(XML_LIBS)
  render_libobrender_la_SOURCES = \
@@@ -96,52 -100,33 +97,52 @@@
  	render/theme.h \
  	render/theme.c
  
 -## parser ##
 +## obt ##
  
 -parser_libobparser_la_CPPFLAGS = \
 +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/parse.h \
 +	obt/parse.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) \
@@@ -155,6 -140,11 +156,6 @@@
  	-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) \
@@@ -163,7 -153,7 +164,7 @@@
  	$(EFENCE_LIBS) \
  	$(LIBINTL) \
  	render/libobrender.la \
 -	parser/libobparser.la
 +	obt/libobt.la
  openbox_openbox_LDFLAGS = -export-dynamic
  openbox_openbox_SOURCES = \
  	gettext.h \
@@@ -202,7 -192,6 +203,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 \
@@@ -224,6 -213,8 +225,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 \
@@@ -245,11 -236,15 +246,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 \
@@@ -265,6 -260,8 +266,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 \
@@@ -278,7 -275,10 +279,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 ##
  
@@@ -289,6 -289,17 +290,17 @@@ tools_gnome_panel_control_gnome_panel_c
  tools_gnome_panel_control_gnome_panel_control_SOURCES = \
  	tools/gnome-panel-control/gnome-panel-control.c
  
+ ## obprop ##
+ 
+ tools_obprop_obprop_CPPFLAGS = \
+ 	$(GLIB_CFLAGS) \
+ 	$(X_CFLAGS)
+ tools_obprop_obprop_LDADD = \
+ 	$(GLIB_LIBS) \
+ 	$(X_LIBS)
+ tools_obprop_obprop_SOURCES = \
+ 	tools/obprop/obprop.c
+ 
  ## gdm-control ##
  
  tools_gdm_control_gdm_control_CPPFLAGS = \
@@@ -395,7 -406,7 +407,7 @@@ dist_syscrash_theme_DATA= 
  
  ## public headers ##
  
 -pubinclude_HEADERS = \
 +rrpubinclude_HEADERS = \
  	render/color.h \
  	render/font.h \
  	render/geom.h \
@@@ -405,22 -416,14 +417,22 @@@
  	render/mask.h \
  	render/render.h \
  	render/theme.h \
 -	parser/parse.h
 -
 -nodist_pubinclude_HEADERS = \
 -	version.h
 +	render/version.h
 +
 +obtpubinclude_HEADERS = \
 +	obt/display.h \
 +	obt/keyboard.h \
 +	obt/mainloop.h \
 +	obt/parse.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
 +	render/obrender-4.0.pc \
 +	obt/obt-4.0.pc
  
  ## data ##
  
@@@ -472,6 -475,7 +484,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 \
@@@ -489,10 -493,8 +501,10 @@@
  	doc/openbox-gnome-session.1.in \
  	doc/openbox-kde-session.1.sgml \
  	doc/openbox-kde-session.1.in \
 -	render/obrender-3.0.pc.in \
 -	parser/obparser-3.0.pc.in \
 +	render/version.h.in \
 +	render/obrender-4.0.pc.in \
 +	obt/obt-4.0.pc.in \
 +	obt/version.h.in \
  	tools/themeupdate/themeupdate.py \
  	tests/hideshow.py \
  	tests/Makefile \
@@@ -548,7 -550,7 +560,7 @@@ CLEANFILES = 
  #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
  
  distclean-local:
 -	for d in . m4 po render; do \
 +	for d in . m4 po render parser obt openbox; do \
  		for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
  			rm -f "$$d/$$p"; \
  		done \
diff --combined data/rc.xml
index 4e96305d,d7a31bda..1bd7ecc2
--- a/data/rc.xml
+++ b/data/rc.xml
@@@ -354,24 -354,14 +354,24 @@@
      </mousebind>
  
      <mousebind button="Up" action="Click">
 -      <action name="Shade"/>
 -      <action name="FocusToBottom"/>
 -      <action name="Unfocus"/>
 -      <action name="Lower"/>
 +      <action name="if">
 +        <shaded>no</shaded>
 +        <then>
 +          <action name="Shade"/>
 +          <action name="FocusToBottom"/>
 +          <action name="Unfocus"/>
 +          <action name="Lower"/>
 +        </then>
 +      </action>
      </mousebind>
      <mousebind button="Down" action="Click">
 -      <action name="Unshade"/>
 -      <action name="Raise"/>
 +      <action name="if">
 +        <shaded>yes</shaded>
 +        <then>
 +          <action name="Unshade"/>
 +          <action name="Raise"/>
 +        </then>
 +      </action>
      </mousebind>
  
      <mousebind button="Right" action="Press">
@@@ -575,23 -565,23 +575,23 @@@
    </context>
  
    <context name="Desktop">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="C-A-Up" action="Press">
 +    <mousebind button="C-A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="C-A-Down" action="Press">
 +    <mousebind button="C-A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
@@@ -616,16 -606,16 +616,16 @@@
    </context>
  
    <context name="MoveResize">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
    </context>
@@@ -656,11 -646,11 +656,11 @@@
    # this is an example with comments through out. use these to make your
    # own rules, but without the comments of course.
  
-   <application name="first element of window's WM_CLASS property (see xprop)"
-               class="second element of window's WM_CLASS property (see xprop)"
-                role="the window's WM_WINDOW_ROLE property (see xprop)"
-                type="the window's _NET_WM_WINDOW_TYPE (if unspecified, then
-                        it is dialog for child windows)">
+   <application name="the window's _OB_NAME property (see obprop)"
+               class="the window's _OB_CLASS property (see obprop)"
+                role="the window's _OB_ROLE property (see obprop)"
+                type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
+                       (if unspecified, then it is 'dialog' for child windows)">
    # the name or the class can be set, or both. this is used to match
    # windows when they appear. role can optionally be set as well, to
    # further restrict your matches.