Merge branch 'review' into wip/mikabox

Conflicts:
	openbox/actions.c
	openbox/actions/growtoedge.c
	openbox/actions/if.c
	openbox/config.c
	openbox/place.c

diff --cc Makefile.am
Simple merge

diff --cc obrender/test.c
Simple merge

diff --cc obrender/theme.c
Simple merge

diff --cc obt/prop.c
Simple merge

diff --cc openbox/actions.c
Simple merge

diff --cc openbox/actions.h
Simple merge

diff --cc openbox/actions/growtoedge.c
index e131896ff2f5fff0940011e5ea6e5bd3dcbde87a,fa1b2c7ed1fa035f8e0602c9874fd62d8821f9ff..9f77d0a88da9c2122ce0fe6cfb841b8042425740
--- 1/openbox/actions/growtoedge.c
--- 2/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@@ -106,23 -184,42 +184,44 @@@ static void free_func(gpointer o
  static gboolean run_func(ObActionsData *data, gpointer options)
  {
      Options *o = options;
-     gint x, y, w, h;
-     ObDirection opp;
-     gint half;
  
-     if (!data->client ||
-         actions_client_locked(data) ||
-         /* don't allow vertical resize if shaded */
-         ((o->dir == OB_DIRECTION_NORTH || o->dir == OB_DIRECTION_SOUTH) &&
-          data->client->shaded))
 -    if (!data->client)
++    if (!data->client || actions_client_locked(data))
 +    {
          return FALSE;
 +    }
  
 -    gboolean doing_verical_resize =
++    gboolean doing_vertical_resize =
+         o->dir == OB_DIRECTION_NORTH ||
+         o->dir == OB_DIRECTION_SOUTH ||
+         o->fill;
 -    if (data->client->shaded && doing_verical_resize)
++    if (data->client->shaded && doing_vertical_resize)
+             return FALSE;
+ 
+     if (o->fill) {
+         if (o->shrink) {
+             /* We don't have any implementation of shrinking for the FillToGrow
+                action. */
+             return FALSE;
+         }
+ 
+         if (do_grow_all_edges(data, CLIENT_RESIZE_GROW_IF_NOT_ON_EDGE))
+             return FALSE;
+ 
+         /* If all the edges are blocked, then allow them to jump past their
+            current block points. */
+         do_grow_all_edges(data, CLIENT_RESIZE_GROW);
+         return FALSE;
+     }
+ 
      if (!o->shrink) {
-         /* try grow */
-         client_find_resize_directional(data->client, o->dir, TRUE,
+         gint x, y, w, h;
+ 
+         /* Try grow. */
+         client_find_resize_directional(data->client,
+                                        o->dir,
+                                        CLIENT_RESIZE_GROW,
                                         &x, &y, &w, &h);
+ 
          if (do_grow(data, x, y, w, h))
              return FALSE;
      }

diff --cc openbox/actions/if.c
index 842ba49f2c3d05b3391bdfbabe43449f3e09d8f5,fd8e1bdb5af1dcb7fbc966e8fd30d4b65539eb39..6ee2bdd9586b4b897838f95047f0f79e1ebad008
--- 1/openbox/actions/if.c
--- 2/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@@ -100,12 -95,15 +101,15 @@@ void action_if_startup(void
  {
      actions_register("If", setup_func, free_func, run_func_if);
      actions_register("Stop", NULL, NULL, run_func_stop);
 +    actions_register("Continue", NULL, NULL, run_func_continue);
      actions_register("ForEach", setup_func, free_func, run_func_foreach);
 -
 -    actions_set_can_stop("Stop", TRUE);
 +    //actions_register("GroupMembers", setup_func, free_func, run_func_group);
  }
  
- static inline set_bool(xmlNodePtr node, const char *name, gboolean *on, gboolean *off)
+ static inline void set_bool(xmlNodePtr node,
+                             const char *name,
+                             gboolean *on,
+                             gboolean *off)
  {
      xmlNodePtr n;
  
@@@ -202,13 -198,9 +205,16 @@@ static void setup_query(Options* o, xml
              g_free(s);
          }
      }
 +    if ((n = obt_xml_find_node(node, "screendesktop"))) {
 +        gchar *s;
 +        if ((s = obt_xml_node_string(n))) {
 +          q->screendesktop_number = atoi(s);
 +          g_free(s);
 +        }
 +    }
+     if ((n = obt_xml_find_node(node, "activedesktop"))) {
+         q->screendesktop_number = obt_xml_node_int(n);
+     }
      if ((n = obt_xml_find_node(node, "title"))) {
          setup_typed_match(&q->title, n);
      }
@@@ -459,31 -445,15 +464,39 @@@ static gboolean run_func_foreach(ObActi
      return FALSE;
  }
  
- static gboolean run_func_stop(ObActionsData *data, gpointer options)
- {
-     actions_stop_running();
-     foreach_stop = TRUE;
- }
 +static gboolean run_func_continue(ObActionsData *data, gpointer options)
 +{
 +    actions_stop_running();
 +}
 +
 +/*
 +static gboolean run_func_group(ObActionsData *data, gpointer acts)
 +{
 +    GSList *it, *a = acts;
 +    ObClient *c = data->client;
 +
 +    if (a && c)
 +        for (it = c->group->members; it; it = g_slist_next(it)) {
 +            ObClient *member = it->data;
 +            if (actions_run_acts(a, data->uact, data->state,
 +                                 data->x, data->y, data->button,
 +                                 data->context, member))
 +                return TRUE;
 +        }
 +
 +    return FALSE;
 +}
 +*/
++
+ static gboolean run_func_stop(ObActionsData *data, gpointer options)
+ {
+     Options *o = options;
+ 
+     /* This stops the loop above so we don't invoke actions on any more
+        clients */
+     o->stop = TRUE;
+ 
+     /* TRUE causes actions_run_acts to not run further actions on the current
+        client */
+     return TRUE;
+ }

diff --cc openbox/actions/moveresizeto.c
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.c
index 492781df911663b3978ab025da5834326f6c2ec8,76f48569aee10c31625821117f2450ec968ae596..1332e396020550d31a8e2b90713ae85cb9f14df8
--- 1/openbox/config.c
--- 2/openbox/config.c
+++ b/openbox/config.c
@@@ -652,11 -626,13 +648,15 @@@ static void parse_placement(xmlNodePtr 
  
      node = node->children;
  
-     if ((n = obt_xml_find_node(node, "policy")))
+     if ((n = obt_xml_find_node(node, "policy"))) {
          if (obt_xml_node_contains(n, "UnderMouse"))
              config_place_policy = OB_PLACE_POLICY_MOUSE;
 +        if (obt_xml_node_contains(n, "Random"))
 +            config_place_policy = OB_PLACE_POLICY_RANDOM;
+     }
+     if ((n = obt_xml_find_node(node, "center"))) {
+         config_place_center = obt_xml_node_bool(n);
+     }
      if ((n = obt_xml_find_node(node, "monitor"))) {
          if (obt_xml_node_contains(n, "active"))
              config_place_monitor = OB_PLACE_MONITOR_ACTIVE;

diff --cc openbox/config.h
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/menuframe.c
Simple merge

diff --cc openbox/moveresize.c
Simple merge

diff --cc openbox/screen.c
index 86378386065b0d577cacd2e698b57ead2612f8e0,0198c36c497d120d8bb2f3c0e8eb93f5539ba24e..c5b97fb2e181a2ed40eb5a1d896c523e2a044a8a
--- 1/openbox/screen.c
--- 2/openbox/screen.c
+++ b/openbox/screen.c
@@@ -55,18 -54,18 +55,18 @@@
  
  static gboolean screen_validate_layout(ObDesktopLayout *l);
  static gboolean replace_wm(void);
 -static void     screen_tell_ksplash(void);
 +//static void     screen_tell_ksplash(void);
  static void     screen_fallback_focus(void);
  
- guint           screen_num_desktops;
- guint           screen_num_monitors;
- guint           screen_desktop;
- guint           screen_last_desktop;
- gboolean        screen_showing_desktop;
- ObDesktopLayout screen_desktop_layout;
- gchar         **screen_desktop_names;
- Window          screen_support_win;
- Time            screen_desktop_user_time = CurrentTime;
+ guint                  screen_num_desktops;
+ guint                  screen_num_monitors;
+ guint                  screen_desktop;
+ guint                  screen_last_desktop;
+ ObScreenShowDestopMode screen_show_desktop_mode;
+ ObDesktopLayout        screen_desktop_layout;
+ gchar                **screen_desktop_names;
+ Window                 screen_support_win;
+ Time                   screen_desktop_user_time = CurrentTime;
  
  static Size     screen_physical_size;
  static guint    screen_old_desktop;
@@@ -448,16 -442,12 +448,16 @@@ void screen_startup(gboolean reconfig
      else
          screen_set_desktop(MIN(config_screen_firstdesk,
                                 screen_num_desktops) - 1, FALSE);
 -    screen_last_desktop = screen_desktop;
 +    OBT_PROP_GET32(obt_root(ob_screen), OB_LAST_DESKTOP, CARDINAL, &screen_last_desktop);
 +    if (screen_last_desktop < 0 || screen_last_desktop >= screen_num_desktops) {
 +        screen_last_desktop = screen_desktop;
 +        OBT_PROP_SET32(obt_root(ob_screen), OB_LAST_DESKTOP, CARDINAL, screen_last_desktop);
 +    }
  
      /* don't start in showing-desktop mode */
-     screen_showing_desktop = FALSE;
+     screen_show_desktop_mode = SCREEN_SHOW_DESKTOP_NO;
      OBT_PROP_SET32(obt_root(ob_screen),
-                    NET_SHOWING_DESKTOP, CARDINAL, screen_showing_desktop);
+                    NET_SHOWING_DESKTOP, CARDINAL, screen_showing_desktop());
  
      if (session_desktop_layout_present &&
          screen_validate_layout(&session_desktop_layout))