Merge branch 'mikabox/personal' into wip/mikabox

Conflicts:

	obt/prop.c

diff --cc obt/prop.c
index 205ce6cda549a984033499d1f7d5f53f52084bfd,ca5c19d4378a715fa19d632e8458df02868a9eb0..17e8b9a3e13c9ea68313e48371203e6e38e6eab6
--- 1/obt/prop.c
--- 2/obt/prop.c
+++ b/obt/prop.c
@@@ -188,9 -189,8 +189,10 @@@ void obt_prop_startup(void
      CREATE_(OB_CONFIG_FILE);
      CREATE_(OB_WM_ACTION_UNDECORATE);
      CREATE_(OB_WM_STATE_UNDECORATED);
 +    CREATE_(OB_WM_STATE_LOCKED);
+     CREATE_(OB_LAST_DESKTOP);
      CREATE_(OB_CONTROL);
 +    CREATE_(OB_TARGET_WINDOW);
  }
  
  Atom obt_prop_atom(ObtPropAtom a)

diff --cc obt/prop.h
index 72226ec3a4729f97125a8dcf771334c1157cb8fb,1107ac8bf67290a23dc2e0844003ea065456c7eb..80e28be949ba3e917e1a665d98fb8e0a0c6ee5b2
--- 1/obt/prop.h
--- 2/obt/prop.h
+++ b/obt/prop.h
@@@ -204,14 -204,14 +204,16 @@@ typedef enum 
  
      /* Openbox specific atoms */
  
+     OBT_PROP_OB_FOCUS,
      OBT_PROP_OB_WM_ACTION_UNDECORATE,
      OBT_PROP_OB_WM_STATE_UNDECORATED,
 +    OBT_PROP_OB_WM_STATE_LOCKED,
      OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */
      OBT_PROP_OB_THEME,
      OBT_PROP_OB_CONFIG_FILE,
+     OBT_PROP_OB_LAST_DESKTOP,
      OBT_PROP_OB_CONTROL,
 +    OBT_PROP_OB_TARGET_WINDOW,
  
      OBT_PROP_NUM_ATOMS
  } ObtPropAtom;

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client_menu.c
Simple merge

diff --cc openbox/event.c
Simple merge