From 86bcfe74fede93616c3fb11b35a7dbbcd4a25f33 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 13 May 2007 21:58:04 +0000 Subject: [PATCH] merge r6470-6478 from trunk --- Makefile.am | 18 ++-- data/rc.xml | 222 +++++++++++++++++++++++++++++------------------ openbox/client.c | 2 - openbox/dock.c | 3 +- openbox/focus.c | 6 ++ openbox/screen.c | 35 +++----- 6 files changed, 169 insertions(+), 117 deletions(-) diff --git a/Makefile.am b/Makefile.am index ea29454d..63120794 100644 --- a/Makefile.am +++ b/Makefile.am @@ -349,7 +349,7 @@ edit = $(SED) \ -e 's!@configdir\@!$(configdir)!' \ -e 's!@bindir\@!$(bindir)!' -data/xsession/openbox-gnome-session: Makefile data \ +data/xsession/openbox-gnome-session: Makefile \ $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @mkdir data 2>/dev/null || true @@ -357,7 +357,7 @@ data/xsession/openbox-gnome-session: Makefile data \ @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ @chmod a+x $@ -data/xsession/openbox-kde-session: Makefile data \ +data/xsession/openbox-kde-session: Makefile \ $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @mkdir data 2>/dev/null || true @@ -365,25 +365,25 @@ data/xsession/openbox-kde-session: Makefile data \ @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ @chmod a+x $@ -doc/openbox.1.in: Makefile doc $(srcdir)/doc/openbox.1.sgml +doc/openbox.1.in: Makefile $(srcdir)/doc/openbox.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@ + @docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@ -doc/openbox.1: Makefile doc doc/openbox.1.in +doc/openbox.1: Makefile doc/openbox.1.in @echo make: creating $@ @mkdir doc 2>/dev/null || true @$(edit) $(srcdir)/doc/openbox.1.in >$@ -doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml +doc/openbox-gnome-session.1: Makefile doc/openbox-gnome-session.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@ + @docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@ -doc/openbox-kde-session.1: Makefile doc doc/openbox-kde-session.1.sgml +doc/openbox-kde-session.1: Makefile doc/openbox-kde-session.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@ + @docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop diff --git a/data/rc.xml b/data/rc.xml index 47e6206e..78185786 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -12,7 +12,7 @@ yes - no + yes no 200 no @@ -41,7 +41,7 @@ yes sans - 7 + 8 bold @@ -50,7 +50,7 @@ sans - 7 + 8 bold @@ -59,9 +59,9 @@ sans - 8 + 9 - bold + normal normal @@ -70,7 +70,7 @@ sans 9 - bold + normal normal @@ -119,22 +119,17 @@ no 300 + 300 + Middle + C-g - - - - - - - - - + no @@ -159,12 +154,36 @@ no - + + 1 + + + 1 + + + 1 + + + 1 + + + + + + + + + + + client-menu + + + @@ -172,191 +191,220 @@ - yes - - - yes + + yesyes + - - - - - - - - - - - client-menu + + + + + + true + Konqueror + + kfmclient openProfile filemanagement + 3 + 200 + + + + - - - - - + + + - + + + + - - client-menu - + - + - + + + + + - - - - - - - + + + + + + + + + client-menu + + + + top + + + - - bottom - + + + + + + + + + client-menu + + + + - - - + + + + - - - + + + + - - - + + + + - - - + - - + - + - + + - - - + client-menu - + + client-menu + - + + - + + - + + - + - + - + @@ -368,14 +416,16 @@ + - + + @@ -383,16 +433,19 @@ + + - - - + + + + client-list-combined-menu @@ -400,6 +453,7 @@ root-menu + @@ -422,9 +476,9 @@ menu.xml - 250 + 200 no - 0 + 100 yes diff --git a/openbox/client.c b/openbox/client.c index 39bd94d5..3d6ae529 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3746,8 +3746,6 @@ ObClient *client_search_transient(ObClient *self, ObClient *search) if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) \ continue; \ if(cur->iconic) \ - continue; \ - if(cur->layer == c->layer) \ continue; #define HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) \ diff --git a/openbox/dock.c b/openbox/dock.c index 697261e2..ae42ab9d 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -414,7 +414,8 @@ void dock_configure() if (!dock->dock_apps) { STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - } else if (config_dock_floating || config_dock_nostrut) { + } else if (config_dock_floating || config_dock_nostrut) + { STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); } else { diff --git a/openbox/focus.c b/openbox/focus.c index 72588a30..f947fe33 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -302,7 +302,13 @@ void focus_nothing() screen_install_colormap(NULL, TRUE); } + /* Don't set focus_client to NULL here. It will be set to NULL when the + FocusOut event comes. Otherwise, if we focus nothing and then focus the + same window again, The focus code says nothing changed, but focus_client + ends up being NULL anyways. focus_client = NULL; + */ + focus_tried = NULL; /* focus isn't "trying" to go anywhere now */ /* if there is a grab going on, then we need to cancel it. if we move diff --git a/openbox/screen.c b/openbox/screen.c index 1cbb2a5e..97fa8849 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -663,7 +663,7 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, { guint r, c; static guint d = (guint)-1; - guint ret; + guint ret, oldd; if (d == (guint)-1) d = screen_desktop; @@ -671,6 +671,7 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, if ((cancel || done) && dialog) goto show_cycle_dialog; + oldd = d; get_row_col(d, &r, &c); if (linear) { @@ -696,19 +697,17 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_EAST: ++c; if (c >= screen_desktop_layout.columns) { - if (wrap) { + if (wrap) c = 0; - } else { - d = screen_desktop; + else goto show_cycle_dialog; - } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { if (wrap) { ++c; } else { - d = screen_desktop; + d = oldd; goto show_cycle_dialog; } } @@ -716,19 +715,17 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_WEST: --c; if (c >= screen_desktop_layout.columns) { - if (wrap) { + if (wrap) c = screen_desktop_layout.columns - 1; - } else { - d = screen_desktop; + else goto show_cycle_dialog; - } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { if (wrap) { --c; } else { - d = screen_desktop; + d = oldd; goto show_cycle_dialog; } } @@ -736,19 +733,17 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_SOUTH: ++r; if (r >= screen_desktop_layout.rows) { - if (wrap) { + if (wrap) r = 0; - } else { - d = screen_desktop; + else goto show_cycle_dialog; - } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { if (wrap) { ++r; } else { - d = screen_desktop; + d = oldd; goto show_cycle_dialog; } } @@ -756,19 +751,17 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_NORTH: --r; if (r >= screen_desktop_layout.rows) { - if (wrap) { + if (wrap) r = screen_desktop_layout.rows - 1; - } else { - d = screen_desktop; + else goto show_cycle_dialog; - } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { if (wrap) { --r; } else { - d = screen_desktop; + d = oldd; goto show_cycle_dialog; } } -- 2.34.1