diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | data/rc.xml | 8 | ||||
| -rw-r--r-- | openbox/event.c | 3 | ||||
| -rw-r--r-- | tools/obxprop/Makefile (renamed from tools/obprop/Makefile) | 0 | ||||
| -rw-r--r-- | tools/obxprop/obxprop.c (renamed from tools/obprop/obprop.c) | 2 |
6 files changed, 13 insertions, 14 deletions
@@ -52,7 +52,7 @@ render/obrender-4.0.pc obt/obt-4.0.pc tools/gnome-panel-control/gnome-panel-control tools/gdm-control/gdm-control -tools/obprop/obprop +tools/obxprop/obxprop version.h .libs .deps diff --git a/Makefile.am b/Makefile.am index 4384054a..3934b62f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gdm-control/gdm-control \ tools/gnome-panel-control/gnome-panel-control \ - tools/obprop/obprop + tools/obxprop/obxprop dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart @@ -290,16 +290,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c -## obprop ## +## obxprop ## -tools_obprop_obprop_CPPFLAGS = \ +tools_obxprop_obxprop_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(X_CFLAGS) -tools_obprop_obprop_LDADD = \ +tools_obxprop_obxprop_LDADD = \ $(GLIB_LIBS) \ $(X_LIBS) -tools_obprop_obprop_SOURCES = \ - tools/obprop/obprop.c +tools_obxprop_obxprop_SOURCES = \ + tools/obxprop/obxprop.c ## gdm-control ## diff --git a/data/rc.xml b/data/rc.xml index ff9016dc..e5eb9178 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -687,10 +687,10 @@ # this is an example with comments through out. use these to make your # own rules, but without the comments of course. - <application name="the window's _OB_NAME property (see obprop)" - class="the window's _OB_CLASS property (see obprop)" - role="the window's _OB_ROLE property (see obprop)" - type="the window's _NET_WM_WINDOW_TYPE (see obprob).. + <application name="the window's _OB_NAME property (see obxprop)" + class="the window's _OB_CLASS property (see obxprop)" + role="the window's _OB_ROLE property (see obxprop)" + type="the window's _NET_WM_WINDOW_TYPE (see obxprob).. (if unspecified, then it is 'dialog' for child windows)"> # the name or the class can be set, or both. this is used to match # windows when they appear. role can optionally be set as well, to diff --git a/openbox/event.c b/openbox/event.c index 1b7b7739..2f853fbb 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1926,8 +1926,7 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev) break; if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) && - (f = find_active_menu()) && f->selected == e && - e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU) + (f = find_active_menu()) && f->selected == e) { ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root, ev->xcrossing.y_root); diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile index cfc46539..cfc46539 100644 --- a/tools/obprop/Makefile +++ b/tools/obxprop/Makefile diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c index e288d7cb..26851544 100644 --- a/tools/obprop/obprop.c +++ b/tools/obxprop/obxprop.c @@ -12,7 +12,7 @@ gint fail(const gchar *s) { else fprintf (stderr, - "Usage: obprop [OPTIONS]\n\n" + "Usage: obxprop [OPTIONS]\n\n" "Options:\n" " --help Display this help and exit\n" " --display DISPLAY Connect to this X display\n" |