Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
Conflicts:
openbox/config.c

16 files changed:
1  2 
obrender/font.c
obrender/render.h
obrender/theme.c
openbox/actions/desktop.c
openbox/actions/resize.c
openbox/client_menu.c
openbox/config.c
openbox/config.h
openbox/event.c
openbox/frame.c
openbox/frame.h
openbox/keyboard.c
openbox/menu.h
openbox/menuframe.c
openbox/mouse.c
openbox/openbox.c

diff --cc obrender/font.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -418,10 -414,8 +418,10 @@@ void client_menu_startup(void
      menu_add_normal(menu, CLIENT_DECORATE, _("Un/_Decorate"), NULL, TRUE);
  
      menu_add_separator(menu, -1, NULL);
 +    menu_add_submenu(menu, 0, "client-list-menu");
 +    menu_add_separator(menu, -1, NULL);
  
      e = menu_add_normal(menu, CLIENT_CLOSE, _("_Close"), NULL, TRUE);
-     e->data.normal.mask = ob_rr_theme->btn_close->mask;
+     e->data.normal.mask = ob_rr_theme->btn_close->unpressed_mask;
      set_icon_color(e);
  }
@@@ -774,15 -773,6 +778,12 @@@ static void parse_theme(xmlNodePtr node
  
          *font = RrFontOpen(ob_rr_inst, name, size, weight, slant);
          g_free(name);
-     next_font:
-         n = obt_xml_find_node(n->next, "font");
 +
 +        if ((fnode = obt_xml_find_node(n->children, "description"))) {
 +            gchar *s = obt_xml_node_string(fnode);
 +            RrFontDescriptionFromString(*font, s);
 +            g_free(s);
 +        }
      }
  }
  
Simple merge
diff --cc openbox/event.c
Simple merge
diff --cc openbox/frame.c
Simple merge
diff --cc openbox/frame.h
Simple merge
Simple merge
diff --cc openbox/menu.h
Simple merge
Simple merge
diff --cc openbox/mouse.c
Simple merge
@@@ -364,14 -327,13 +364,14 @@@ gint main(gint argc, gchar **argv
              mouse_startup(reconfigure);
              menu_frame_startup(reconfigure);
              menu_startup(reconfigure);
 +            edges_startup(reconfigure);
              prompt_startup(reconfigure);
  
-             /* do this after everything is started so no events will get
-                missed */
-             xqueue_listen();
              if (!reconfigure) {
+                 /* do this after everything is started so no events will get
+                    missed */
+                 xqueue_listen();
                  guint32 xid;
                  ObWindow *w;