Merge gfxmenu into gfxmenu+multiterm

diff --cc include/grub/gui.h
index 9cfbdde8197041f3a5eaf80d3319da33aa13c601,7c47748386cd301fb73f6e7659a77a7372d38c52..6f8f44805388e1ad9705d9f761c7d4de5b29d62b
--- 1/include/grub/gui.h
--- 2/include/grub/gui.h
+++ b/include/grub/gui.h
@@@ -71,20 -71,21 +71,20 @@@ struct grub_gui_container_op
  struct grub_gui_list_ops
  {
    void (*set_view_info) (void *self,
 -                         const char *theme_path,
 -                         grub_gfxmenu_model_t menu);
 +                         grub_gfxmenu_view_t view);
  };
  
- typedef grub_uint32_t grub_fixed_unsigned_t;
+ typedef signed grub_fixed_signed_t;
  #define GRUB_FIXED_1 0x10000
  
- static inline unsigned
- grub_fixed_ufu_divide (grub_uint32_t a, grub_fixed_unsigned_t b)
+ static inline signed
+ grub_fixed_sfs_divide (signed a, grub_fixed_signed_t b)
  {
-   return (a << 16) / b;
+   return (a * GRUB_FIXED_1) / b;
  }
  
- static inline grub_fixed_unsigned_t
- grub_fixed_fuf_divide (grub_fixed_unsigned_t a, grub_uint32_t b)
+ static inline grub_fixed_signed_t
+ grub_fixed_fsf_divide (grub_fixed_signed_t a, signed b)
  {
    return a / b;
  }