X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=4ae4587b8e0bf71f9ebc149f54d362f725314d62;hb=709c747a743be285b97d0ddfcaa28940394840b9;hp=11f235b1a51d5af460343dee6ee60a7a6dbb0798;hpb=fffcc1ee58413295c4baab2a49fe76b1266cf936;p=chaz%2Fopenbox diff --git a/scripts/builtins.py b/scripts/builtins.py index 11f235b1..4ae4587b 100644 --- a/scripts/builtins.py +++ b/scripts/builtins.py @@ -5,29 +5,29 @@ def state_above(data, add=2): """Toggles, adds or removes the 'above' state on a window.""" if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_wm_state, data.client.window(), add, - openbox.property().atom(Property.net_wm_state_above)) + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().net_wm_state, data.client.window(), add, + Property_atoms().net_wm_state_above) def state_below(data, add=2): """Toggles, adds or removes the 'below' state on a window.""" if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_wm_state, data.client.window(), add, - openbox.property().atom(Property.net_wm_state_below)) + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().net_wm_state, data.client.window(), add, + Property_atoms().net_wm_state_below) def state_shaded(data, add=2): """Toggles, adds or removes the 'shaded' state on a window.""" if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_wm_state, data.client.window(), add, - openbox.property().atom(Property.net_wm_state_shaded)) + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().net_wm_state, data.client.window(), add, + Property_atoms().net_wm_state_shaded) def close(data): """Closes the window on which the event occured""" if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_close_window, data.client.window(), 0) + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().net_close_window, data.client.window(), 0) def focus(data): """Focuses the window on which the event occured""" @@ -93,12 +93,12 @@ def restart(data, other = ""): def raise_win(data): """Raises the window on which the event occured""" if not data.client: return - openbox.screen(data.screen).restack(1, data.client) + openbox.screen(data.screen).raiseWindow(data.client) def lower_win(data): """Lowers the window on which the event occured""" if not data.client: return - openbox.screen(data.screen).restack(0, data.client) + openbox.screen(data.screen).lowerWindow(data.client) def toggle_shade(data): """Toggles the shade status of the window on which the event occured""" @@ -114,8 +114,8 @@ def unshade(data): def change_desktop(data, num): """Switches to a specified desktop""" - root = Display_screenInfo(data.screen).rootWindow() - send_client_msg(root, Property.net_current_desktop, root, num) + root = display.screenInfo(data.screen).rootWindow() + send_client_msg(root, Property_atoms().net_current_desktop, root, num) def next_desktop(data, no_wrap=0): """Switches to the next desktop, optionally (by default) cycling around to @@ -141,18 +141,26 @@ def prev_desktop(data, no_wrap=0): d = n - 1 change_desktop(data, d) -def send_to_all_desktops(data): - """Sends a client to all desktops""" - if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_wm_desktop, data.client.window(), 0xffffffff) - def send_to_desktop(data, num): """Sends a client to a specified desktop""" if not data.client: return - send_client_msg(Display_screenInfo(data.screen).rootWindow(), - Property.net_wm_desktop, data.client.window(), num) + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().net_wm_desktop, data.client.window(), num) +def toggle_all_desktops(data): + """Toggles between sending a client to all desktops and to the current + desktop.""" + if not data.client: return + if not data.client.desktop() == 0xffffffff: + send_to_desktop(data, 0xffffffff) + else: + send_to_desktop(data, openbox.screen(data.screen).desktop()) + +def send_to_all_desktops(data): + """Sends a client to all desktops""" + if not data.client: return + send_to_desktop(data, 0xffffffff) + def send_to_next_desktop(data, no_wrap=0, follow=1): """Sends a window to the next desktop, optionally (by default) cycling around to the first when going past the last. Also optionally moving to @@ -254,6 +262,7 @@ def setup_window_clicks(): def setup_window_buttons(): """Sets up the default behaviors for the buttons in the window titlebar.""" + mbind("Left", MC_AllDesktopsButton, MouseClick, toggle_all_desktops) mbind("Left", MC_CloseButton, MouseClick, close) def setup_scroll(): @@ -278,34 +287,8 @@ def setup_scroll(): def setup_fallback_focus(): """Sets up a focus fallback routine so that when no windows are focused, the last window to have focus on the desktop will be focused.""" - focus_stack = [] - def focused(data): - #global focus_stack - if data.client: - window = data.client.window() - # add to front the stack - if window in focus_stack: - focus_stack.remove(window) - focus_stack.insert(0, window) - else: - # pass around focus - desktop = openbox.screen(data.screen).desktop() - l = len(focus_stack) - i = 0 - while i < l: - w = focus_stack[i] - client = openbox.findClient(w) - if not client: # window is gone, remove it - focus_stack.pop(i) - l = l - 1 - elif client.desktop() == desktop and \ - client.normal() and client.focus(): - break - else: - i = i + 1 - - ebind(EventFocus, focused) - + global ob_focus_fallback # see focus.py + ob_focus_fallback = 1 ############################################################################ ### Window placement algorithms, choose one of these and ebind it to the ### @@ -317,9 +300,12 @@ import random def placewindows_random(data): if not data.client: return client_area = data.client.area() - screen = Display_screenInfo(data.screen) - width = screen.width() - client_area.width() - height = screen.height() - client_area.height() + frame_size = data.client.frame.size() + screen = display.screenInfo(data.screen) + width = screen.width() - (client_area.width() + + frame_size.left + frame_size.right) + height = screen.height() - (client_area.height() + + frame_size.top + frame_size.bottom) global ob_rand if not ob_rand: ob_rand = random.Random() x = ob_rand.randrange(0, width-1)