diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/config.sh | 18 | ||||
| -rwxr-xr-x | contrib/tiled.py | 42 |
2 files changed, 30 insertions, 30 deletions
diff --git a/contrib/config.sh b/contrib/config.sh index 969ceb6..c5f3969 100755 --- a/contrib/config.sh +++ b/contrib/config.sh @@ -29,18 +29,18 @@ riverctl map normal $mod Comma focus-output previous riverctl map normal $mod+Shift Period send-to-output next riverctl map normal $mod+Shift Comma send-to-output previous -# Mod+Return to bump the focused view to the top of the layout stack, making -# it the new master +# Mod+Return to bump the focused view to the top of the layout stack riverctl map normal $mod Return zoom -# Mod+H and Mod+L to decrease/increase the width of the master column by 5% -riverctl map normal $mod H mod-master-factor -0.05 -riverctl map normal $mod L mod-master-factor +0.05 +# Mod+H and Mod+L to decrease/increase the main factor by 5% +# If using rivertile(1) this determines the width of the main stack. +riverctl map normal $mod H mod-main-factor -0.05 +riverctl map normal $mod L mod-main-factor +0.05 # Mod+Shift+H and Mod+Shift+L to increment/decrement the number of -# master views in the layout -riverctl map normal $mod+Shift H mod-master-count +1 -riverctl map normal $mod+Shift L mod-master-count -1 +# main views in the layout +riverctl map normal $mod+Shift H mod-main-count +1 +riverctl map normal $mod+Shift L mod-main-count -1 # Mod+Alt+{H,J,K,L} to move views riverctl map normal $mod+Mod1 H move left 100 @@ -95,7 +95,7 @@ riverctl map normal $mod Space toggle-float # Mod+F to toggle fullscreen riverctl map normal $mod F toggle-fullscreen -# Mod+{Up,Right,Down,Left} to change master orientation +# Mod+{Up,Right,Down,Left} to change layout orientation riverctl map normal $mod Up layout rivertile top riverctl map normal $mod Right layout rivertile right riverctl map normal $mod Down layout rivertile down diff --git a/contrib/tiled.py b/contrib/tiled.py index 2bec975..325854c 100755 --- a/contrib/tiled.py +++ b/contrib/tiled.py @@ -4,7 +4,7 @@ from sys import argv # This is an implementation of the default "tiled" layout of dwm # -# With 4 views and one master, the layout looks something like this: +# With 4 views and one main view, the layout looks something like this: # # +-----------------------+------------+ # | | | @@ -23,46 +23,46 @@ from sys import argv # Assign the arguments to variables. The order and meaning of the arguments # is explained in the river-layouts(7) man page num_views = int(argv[1]) -master_count = int(argv[2]) -master_factor = float(argv[3]) +main_count = int(argv[2]) +main_factor = float(argv[3]) output_width = int(argv[4]) output_height = int(argv[5]) -secondary_count = num_views - master_count +secondary_count = num_views - main_count -# handle the cases where there are no master or no secondary views -master_width = 0 +# handle the cases where there are no main or no secondary views +main_width = 0 secondary_width = 0 -if master_count > 0 and secondary_count > 0: - master_width = int(master_factor * output_width) - secondary_width = output_width - master_width -elif master_count > 0: - master_width = output_width +if main_count > 0 and secondary_count > 0: + main_width = int(main_factor * output_width) + secondary_width = output_width - main_width +elif main_count > 0: + main_width = output_width elif secondary_count > 0: secondary_width = output_width # for each view, output the location/dimensions separated by spaces on a new line for i in range(num_views): - if i < master_count: - # to make things pixel-perfect, we make the first master and first secondary + if i < main_count: + # to make things pixel-perfect, we make the first main and first secondary # view slightly larger if the height is not evenly divisible - master_height = output_height // master_count - master_height_rem = output_height % master_count + main_height = output_height // main_count + main_height_rem = output_height % main_count x = 0 - y = i * master_height + (master_height_rem if i > 0 else 0) - width = master_width - height = master_height + (master_height_rem if i == 0 else 0) + y = i * main_height + (main_height_rem if i > 0 else 0) + width = main_width + height = main_height + (main_height_rem if i == 0 else 0) print(x, y, width, height) else: secondary_height = output_height // secondary_count secondary_height_rem = output_height % secondary_count - x = master_width - y = (i - master_count) * secondary_height + (secondary_height_rem if i > master_count else 0) + x = main_width + y = (i - main_count) * secondary_height + (secondary_height_rem if i > main_count else 0) width = secondary_width - height = secondary_height + (secondary_height_rem if i == master_count else 0) + height = secondary_height + (secondary_height_rem if i == main_count else 0) print(x, y, width, height) |