diff options
-rw-r--r-- | config | 10 | ||||
-rw-r--r-- | sway/config.c | 5 |
2 files changed, 9 insertions, 6 deletions
@@ -44,7 +44,7 @@ set $menu dmenu_run | |||
44 | bindsym $mod+Shift+e exit | 44 | bindsym $mod+Shift+e exit |
45 | # | 45 | # |
46 | # Moving around: | 46 | # Moving around: |
47 | # | 47 | # |
48 | # Move your focus around with $mod+[h|j|k|l], like vim | 48 | # Move your focus around with $mod+[h|j|k|l], like vim |
49 | bindsym $mod+h focus left | 49 | bindsym $mod+h focus left |
50 | bindsym $mod+j focus down | 50 | bindsym $mod+j focus down |
@@ -68,7 +68,7 @@ set $menu dmenu_run | |||
68 | bindsym $mod+Shift+Right move right | 68 | bindsym $mod+Shift+Right move right |
69 | # | 69 | # |
70 | # Workspaces: | 70 | # Workspaces: |
71 | # | 71 | # |
72 | # switch to workspace | 72 | # switch to workspace |
73 | bindsym $mod+1 workspace 1 | 73 | bindsym $mod+1 workspace 1 |
74 | bindsym $mod+2 workspace 2 | 74 | bindsym $mod+2 workspace 2 |
@@ -91,7 +91,7 @@ set $menu dmenu_run | |||
91 | bindsym $mod+Shift+8 move container to workspace 8 | 91 | bindsym $mod+Shift+8 move container to workspace 8 |
92 | bindsym $mod+Shift+9 move container to workspace 9 | 92 | bindsym $mod+Shift+9 move container to workspace 9 |
93 | bindsym $mod+Shift+0 move container to workspace 10 | 93 | bindsym $mod+Shift+0 move container to workspace 10 |
94 | # | 94 | # |
95 | # Layout stuff: | 95 | # Layout stuff: |
96 | # | 96 | # |
97 | # You can "split" the current object of your focus with | 97 | # You can "split" the current object of your focus with |
@@ -118,10 +118,10 @@ set $menu dmenu_run | |||
118 | bindsym $mod+a focus parent | 118 | bindsym $mod+a focus parent |
119 | # | 119 | # |
120 | # Scratchpad: | 120 | # Scratchpad: |
121 | # | 121 | # |
122 | # Sway has a "scratchpad", which is a bag of holding for windows. | 122 | # Sway has a "scratchpad", which is a bag of holding for windows. |
123 | # You can send windows there and get them back later. | 123 | # You can send windows there and get them back later. |
124 | 124 | ||
125 | # Move the currently focused window to the scratchpad | 125 | # Move the currently focused window to the scratchpad |
126 | bindsym $mod+Shift+minus move scratchpad | 126 | bindsym $mod+Shift+minus move scratchpad |
127 | 127 | ||
diff --git a/sway/config.c b/sway/config.c index fc21b2a9..4955c94f 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -238,15 +238,18 @@ bool read_config(FILE *file, bool is_active) { | |||
238 | bool success = true; | 238 | bool success = true; |
239 | enum cmd_status block = CMD_BLOCK_END; | 239 | enum cmd_status block = CMD_BLOCK_END; |
240 | 240 | ||
241 | int line_number = 0; | ||
241 | char *line; | 242 | char *line; |
242 | while (!feof(file)) { | 243 | while (!feof(file)) { |
243 | line = read_line(file); | 244 | line = read_line(file); |
245 | line_number++; | ||
244 | line = strip_comments(line); | 246 | line = strip_comments(line); |
245 | struct cmd_results *res = config_command(line); | 247 | struct cmd_results *res = config_command(line); |
246 | switch(res->status) { | 248 | switch(res->status) { |
247 | case CMD_FAILURE: | 249 | case CMD_FAILURE: |
248 | case CMD_INVALID: | 250 | case CMD_INVALID: |
249 | sway_log(L_ERROR, "Error on line '%s': %s", line, res->error); | 251 | sway_log(L_ERROR, "Error on line %i '%s': %s", line_number, line, |
252 | res->error); | ||
250 | success = false; | 253 | success = false; |
251 | break; | 254 | break; |
252 | 255 | ||