X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbuiltins.py;h=8bf3cd1df659c8c84c0e08868333c295b2271683;hb=bb303c74047b7d4f13b54170e1d24fbe5662e9f9;hp=69271b21dbcc39913e5ff19f04dccee0acb16bef;hpb=af1ac846ccb5fab8a3c83d8688db3d3f96f5a98b;p=chaz%2Fopenbox diff --git a/scripts/builtins.py b/scripts/builtins.py index 69271b21..8bf3cd1d 100644 --- a/scripts/builtins.py +++ b/scripts/builtins.py @@ -22,6 +22,22 @@ def state_shaded(data, add=2): send_client_msg(display.screenInfo(data.screen).rootWindow(), Property_atoms().net_wm_state, data.client.window(), add, Property_atoms().net_wm_state_shaded) + +def iconify(data): + """Iconifies the window on which the event occured""" + if not data.client: return + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().wm_change_state, + data.client.window(), 3) # IconicState + +def restore(data): + """Un-iconifies the window on which the event occured, but does not focus + if. If you want to focus the window too, it is recommended that you + use the activate() function.""" + if not data.client: return + send_client_msg(display.screenInfo(data.screen).rootWindow(), + Property_atoms().wm_change_state, + data.client.window(), 1) # NormalState def close(data): """Closes the window on which the event occured""" @@ -141,19 +157,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_atoms().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_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 @@ -204,11 +227,12 @@ def setup_click_focus(click_raise = 1): mbind("Left", MC_Handle, MousePress, focus) mbind("Left", MC_Grip, MousePress, focus) mbind("Left", MC_Window, MousePress, focus) + mbind("A-Left", MC_Frame, MousePress, focus) if click_raise: mbind("Left", MC_Titlebar, MousePress, raise_win) mbind("Left", MC_Handle, MousePress, raise_win) mbind("Left", MC_Grip, MousePress, raise_win) - mbind("Left", MC_Window, MousePress, raise_win) + mbind("Left", MC_Window, MousePress, raise_win) def setup_sloppy_focus(click_focus = 1, click_raise = 0): """Sets up for focusing windows when the mouse pointer enters them. @@ -255,7 +279,9 @@ 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) + mbind("Left", MC_IconifyButton, MouseClick, iconify) def setup_scroll(): """Sets up the default behaviors for the mouse scroll wheel. @@ -279,34 +305,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 ### @@ -318,14 +318,16 @@ import random def placewindows_random(data): if not data.client: return client_area = data.client.area() - screen = display.screenInfo(data.screen) - # XXX - USE THE FRAME'S SIZE!! - width = screen.width() - client_area.width() - height = screen.height() - client_area.height() + frame_size = data.client.frame.size() + screen_area = openbox.screen(data.screen).area() + width = screen_area.width() - (client_area.width() + + frame_size.left + frame_size.right) + height = screen_area.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) - y = ob_rand.randrange(0, height-1) + x = ob_rand.randrange(screen_area.x(), width-1) + y = ob_rand.randrange(screen_area.y(), height-1) data.client.move(x, y)