don't menu menus jump around at all anymore. open them on screen in the first place
Dana Jansens danakj@orodu.net
6 files changed,
151 insertions(+),
84 deletions(-)
M
openbox/config.c
→
openbox/config.c
@@ -75,7 +75,6 @@ gint config_mouse_threshold;
gint config_mouse_dclicktime; gboolean config_menu_warppointer; -gboolean config_menu_xorstyle; guint config_menu_hide_delay; gboolean config_menu_middle; guint config_submenu_show_delay;@@ -647,8 +646,6 @@ g_free(c);
} if ((n = parse_find_node("warpPointer", node))) config_menu_warppointer = parse_bool(doc, n); - if ((n = parse_find_node("xorStyle", node))) - config_menu_xorstyle = parse_bool(doc, n); if ((n = parse_find_node("hideDelay", node))) config_menu_hide_delay = parse_int(doc, n); if ((n = parse_find_node("middle", node)))@@ -853,7 +850,6 @@
parse_register(i, "resistance", parse_resistance, NULL); config_menu_warppointer = TRUE; - config_menu_xorstyle = TRUE; config_menu_hide_delay = 250; config_menu_middle = FALSE; config_submenu_show_delay = 0;
M
openbox/config.h
→
openbox/config.h
@@ -128,8 +128,6 @@ extern gboolean config_resist_layers_below;
/*! Warp near edge on menu? */ extern gboolean config_menu_warppointer; -/*! make menus jump around a lot */ -extern gboolean config_menu_xorstyle; /*! delay for hiding menu when opening */ extern guint config_menu_hide_delay; /*! Center menus vertically about the parent entry */
M
openbox/event.c
→
openbox/event.c
@@ -1263,10 +1263,11 @@ break;
case MotionNotify: if ((f = menu_frame_under(ev->xmotion.x_root, ev->xmotion.y_root))) { - menu_frame_move_on_screen(f); if ((e = menu_entry_frame_under(ev->xmotion.x_root, - ev->xmotion.y_root))) + ev->xmotion.y_root))) { + /* XXX menu_frame_entry_move_on_screen(f); */ menu_frame_select(f, e); + } } { ObMenuFrame *a;