about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--dwm.13
-rw-r--r--dwm.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/dwm.1 b/dwm.1
index aafce8f..81a447e 100644
--- a/dwm.1
+++ b/dwm.1
@@ -86,6 +86,9 @@ Close focused window.
 .B Mod1-space
 Toggle between tiling and floating mode (affects all windows).
 .TP
+.B Mod1-Shift-space
+Toggle focused window between floating and non-floating state.
+.TP
 .B Mod1-[1..n]
 View all windows with
 .BR nth
diff --git a/dwm.h b/dwm.h
index 1f7dfe8..2f3ce74 100644
--- a/dwm.h
+++ b/dwm.h
@@ -164,7 +164,7 @@ extern void focusprev(Arg *arg);		/* focuses previous visible client, arg is ign
 extern Bool isvisible(Client *c);		/* returns True if client is visible */
 extern void resizemaster(Arg *arg);		/* resizes the master percent with arg's index value */
 extern void restack(void);			/* restores z layers of all clients */
-extern void togglefloat(Arg *arg);		/* toggles selected client floating/tiled resp. */
+extern void togglefloat(Arg *arg);		/* toggles focusesd client between floating/non-floating state */
 extern void togglemode(Arg *arg);		/* toggles global arrange function (dotile/dofloat) */
 extern void toggleview(Arg *arg);		/* toggles the tag with arg's index (in)visible */
 extern void view(Arg *arg);			/* views the tag with arg's index */
kkartik.com> 2020-01-27 01:38:21 -0800 committer Kartik Agaram <vc@akkartik.com> 2020-01-27 01:38:21 -0800 5926' href='/akkartik/mu/commit/apps/braces.subx?h=main&id=edfc025a4f5029c4beb2056b118ab50ec7ec4746'>edfc025a ^
6ecddbaa ^




edfc025a ^
6ecddbaa ^

edfc025a ^
6ecddbaa ^
866bc066 ^
6ecddbaa ^
edfc025a ^
6ecddbaa ^

edfc025a ^
6ecddbaa ^





edfc025a ^
6ecddbaa ^
edfc025a ^
6ecddbaa ^
866bc066 ^
6ecddbaa ^

edfc025a ^
6ecddbaa ^
edfc025a ^
6ecddbaa ^




7a583220 ^
6ecddbaa ^

931b17da ^
4ac2020f ^
6ecddbaa ^
6070c23e ^
4ac2020f ^
6ecddbaa ^
6323661c ^
6070c23e ^
6ecddbaa ^



4ac2020f ^


6ecddbaa ^

4ac2020f ^
7dac9ade ^
6ecddbaa ^
71eb22a5 ^
6ecddbaa ^
71eb22a5 ^


6ecddbaa ^








866bc066 ^
6ecddbaa ^


866bc066 ^
6ecddbaa ^
71eb22a5 ^
6ecddbaa ^





866bc066 ^
6ecddbaa ^


866bc066 ^
6ecddbaa ^
866bc066 ^

6ecddbaa ^
7a583220 ^
6ecddbaa ^


866bc066 ^







71eb22a5 ^
866bc066 ^




71eb22a5 ^
866bc066 ^



71eb22a5 ^
866bc066 ^
71eb22a5 ^
866bc066 ^








6070c23e ^
866bc066 ^








6070c23e ^
866bc066 ^


690fa191 ^
866bc066 ^









6070c23e ^
866bc066 ^




690fa191 ^
866bc066 ^







6323661c ^
6070c23e ^
866bc066 ^







6070c23e ^
866bc066 ^



2a2a5b1e ^

6070c23e ^
866bc066 ^



690fa191 ^
866bc066 ^







2a2a5b1e ^

6070c23e ^
866bc066 ^



690fa191 ^
866bc066 ^















4ac2020f ^
866bc066 ^

6ecddbaa ^
866bc066 ^





7a583220 ^
866bc066 ^




7a583220 ^
866bc066 ^




686a52bd ^

866bc066 ^










7a583220 ^
866bc066 ^
















7a583220 ^
866bc066 ^




686a52bd ^

866bc066 ^










7a583220 ^
866bc066 ^




















7a583220 ^
866bc066 ^




686a52bd ^

866bc066 ^










7a583220 ^
6ecddbaa ^


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359


                                                            
                                                                                
                          



                

                              
     
                             
           

                                




                
                              

     
                             
     
                             
           
                                

            
                               





                
                               
       
                             
     
                             

             
                                 
              
                               




                                               
                

                        
                                 
                                     
                                   
                                                     
                                              
                                                    
                                    
                                                    



                                       


                                       

                          
                      
                               
 
                                                                   
                 


                                                                       








                                                                             
                    


                                          
                    
                    
                                                                    





                                                                             
                                      


                                                           
                                     
                                              

                                      
                  
                


                        







                            
                                     




                                        
                                         



                                       
                                    
                                
                               








                                   
                                              








                                                        
                                                               


                                           
                                              









                                                        
                                                 




                                        
                                              







                                          
                                    
                                                  







                                                       
                                             



                                                                    

                                         
                                                  



                                        
                                              







                                                             

                                         
                                                   



                                       
                                              















                                          
                 

                                   
                         





                 
                




                                           
                




                                      

                                                      










                                                                                                              
                
















                        
                




                                      

                                                      










                                                                                                                                                                    
                




















                        
                




                                      

                                                      










                                                                                                                                                                                                         
                


                        
# Structured control flow using break/loop rather than jump.
#
# To run (on Linux):
#   $ ./translate_subx init.linux 0*.subx apps/subx-params.subx apps/braces.subx
#   $ mv a.elf apps/braces
#
# Example 1:
#   $ cat x.subx
#   {
#     7c/jump-if-< break/disp8
#     74/jump-if-= loop/disp8
#   }
#   $ cat x.subx |apps/braces
#   _loop1:
#     7c/jump-if-< _break1/disp8
#     74/jump-if-= _loop1/disp8
#   _break1:
#
# Example 2:
#   $ cat x.subx
#   {
#     7c/jump-if-< break/disp8
#   }
#   {
#     74/jump-if-= loop/disp8
#   }
#   $ cat x.subx |apps/braces
#   _loop1:
#     7c/jump-if-< _break1/disp8
#   _break1:
#   _loop2:
#     74/jump-if-= _loop2/disp8
#   _break2:
#
# Example 3:
#   $ cat x.subx
#   {
#     {
#       74/jump-if-= loop/disp8
#     }
#     7c/jump-if-< loop/disp8
#   }
#   $ cat x.subx |apps/braces
#   _loop1:
#     _loop2:
#       74/jump-if-= _loop2/disp8
#     _break2:
#     7c/jump-if-< _loop1/disp8
#   _break1:

== code

Entry:  # run tests if necessary, a REPL if not
    # . prologue
    89/<- %ebp 4/r32/esp
    # initialize heap
    (new-segment *Heap-size Heap)
    # if (argc <= 1) goto interactive
    81 7/subop/compare *ebp 1/imm32
    7e/jump-if-<= $subx-braces-main:interactive/disp8
    # if (argv[1] != "test")) goto interactive
    (kernel-string-equal? *(ebp+8) "test")  # => eax
    3d/compare-eax-and 0/imm32/false
    74/jump-if-= $subx-braces-main:interactive/disp8
    #
    (run-tests)
    # syscall(exit, *Num-test-failures)
    8b/-> *Num-test-failures 3/r32/ebx
    eb/jump $subx-braces-main:end/disp8
$subx-braces-main:interactive:
    (subx-braces Stdin Stdout)
    # syscall(exit, 0)
    bb/copy-to-ebx 0/imm32
$subx-braces-main:end:
    e8/call syscall_exit/disp32

subx-braces:  # in: (addr buffered-file), out: (addr buffered-file)
    # pseudocode:
    #   var line: (stream byte 512)
    #   var label-stack: (stack int 32)  # at most 32 levels of nesting
    #   var next-label-id: int = 1
    #   while true
    #     clear-stream(line)
    #     read-line-buffered(in, line)
    #     if (line->write == 0) break                           # end of file
    #     skip-chars-matching-whitespace(line)
    #     if line->data[line->read] == '{'
    #       print(out, "_loop" next-label-id ":\n")
    #       push(label-stack, next-label-id)
    #       ++next-label-id
    #       continue
    #     if line->data[line->read] == '}'
    #       var top = pop(label-stack)
    #       print(out, "_break" top ":\n")
    #       continue
    #     while true
    #       var word-slice: (addr slice) = next-word-or-string(line)
    #       if slice-empty?(word-slice)                         # end of line
    #         break
    #       if slice-starts-with?(word-slice, "#")              # comment
    #         continue
    #       if slice-starts-with?(word-slice, "break/")
    #         var top = top(label-stack)
    #         print(out, "_break" top)
    #         word-slice->start += len("break")
    #       else if slice-starts-with?(word-slice, "loop/")
    #         var top = top(label-stack)
    #         print(out, "_loop" top)
    #         word-slice->start += len("loop")
    #       print(out, word-slice " ")
    #     print(out, "\n")
    #   flush(out)
    # . prologue
    55/push-ebp
    89/<- %ebp 4/r32/esp
    # . save registers
    50/push-eax
    51/push-ecx
    52/push-edx
    53/push-ebx
    56/push-esi
    57/push-edi
    # esi = in
    8b/-> *(ebp+8) 6/r32/esi
    # var line/ecx: (stream byte 512)
    81 5/subop/subtract %esp 0x200/imm32
    68/push 0x200/imm32/length
    68/push 0/imm32/read
    68/push 0/imm32/write
    89/<- %ecx 4/r32/esp
    # var label-stack/edx: (stack int 32)
    81 5/subop/subtract %esp 0x80/imm32
    68/push 0x80/imm32/length
    68/push 0/imm32/top
    89/<- %edx 4/r32/esp
    # var next-label-id/ebx: int = 1
    c7 0/subop/copy %ebx 1/imm32
    # var word-slice/edi: slice
    68/push 0/imm32/end
    68/push 0/imm32/start
    89/<- %edi 4/r32/esp
$subx-braces:line-loop:
    (clear-stream %ecx)
    (read-line-buffered %esi %ecx)
$subx-braces:check0:
    # if (line->write == 0) break
    81 7/subop/compare *ecx 0/imm32
    0f 84/jump-if-=  $subx-braces:break/disp32
    (skip-chars-matching-whitespace %ecx)
$subx-braces:check-for-curly-open:
    # if (line->data[line->read] != '{') goto next check
    # . eax = line->data[line->read]
    8b/-> *(ecx+4) 0/r32/eax
    8a/copy-byte *(ecx+eax+0xc) 0/r32/AL
    81 4/subop/and %eax 0xff/imm32
    # . if (eax != '{') continue
    3d/compare-eax-and 0x7b/imm32/open-curly
    0f 85/jump-if-!= $subx-braces:check-for-curly-closed/disp32
$subx-braces:emit-curly-open:
    # print(out, "_loop" next-label-id ":")
    (write-buffered *(ebp+0xc) "_loop")
    (write-int32-hex-buffered *(ebp+0xc) %ebx)
    (write-buffered *(ebp+0xc) ":")
    # push(label-stack, next-label-id)
    (push %edx %ebx)
    # ++next-label-id
    ff 0/subop/increment %ebx
    # continue
    e9/jump  $subx-braces:next-line/disp32
$subx-braces:check-for-curly-closed:
    # if (line->data[line->read] != '}') goto next check
    3d/compare-eax-and 0x7d/imm32/close-curly
    0f 85/jump-if-= $subx-braces:word-loop/disp32
$subx-braces:emit-curly-closed:
    # eax = pop(label-stack)
    (pop %edx)
    # print(out, "_break" eax ":")
    (write-buffered *(ebp+0xc) "_break")
    (write-int32-hex-buffered *(ebp+0xc) %eax)
    (write-buffered *(ebp+0xc) ":")
    # continue
    e9/jump  $subx-braces:next-line/disp32
$subx-braces:word-loop:
    (next-word-or-string %ecx %edi)
$subx-braces:check1:
    # if (slice-empty?(word-slice)) break
    (slice-empty? %edi)
    3d/compare-eax-and 0/imm32/false
    0f 85/jump-if-!= $subx-braces:next-line/disp32
$subx-braces:check-for-comment:
    # if (slice-starts-with?(word-slice, "#")) continue
    # . eax = *word-slice->start
    8b/-> *edi 0/r32/eax
    8a/copy-byte *eax 0/r32/AL
    81 4/subop/and %eax 0xff/imm32
    # . if (eax == '#') continue
    3d/compare-eax-and 0x23/imm32/hash
    74/jump-if-= $subx-braces:word-loop/disp8
$subx-braces:check-for-break:
    # if (!slice-starts-with?(word-slice, "break/")) goto next check
    # . eax = slice-starts-with?(word-slice, "break/")
    (slice-starts-with? %edi "break/")
    # . if (eax == false) goto next check
    3d/compare-eax-and 0/imm32/false
    74/jump-if-= $subx-braces:check-for-loop/disp8
$subx-braces:emit-break:
    (top %edx)
    # print(out, "_break" eax)
    (write-buffered *(ebp+0xc) "_break")
    (write-int32-hex-buffered *(ebp+0xc) %eax)
    # word-slice->start += len("break")
    81 0/subop/add *edi 5/imm32/strlen
    # emit rest of word as usual
    eb/jump $subx-braces:emit-word-slice/disp8
$subx-braces:check-for-loop:
    # if (!slice-starts-with?(word-slice, "loop/")) emit word
    # . eax = slice-starts-with?(word-slice, "loop/")
    (slice-starts-with? %edi "loop/")
    # . if (eax == false) goto next check
    3d/compare-eax-and 0/imm32/false
    74/jump-if-= $subx-braces:emit-word-slice/disp8
$subx-braces:emit-loop:
    (top %edx)
    # print(out, "_loop" eax)
    (write-buffered *(ebp+0xc) "_loop")
    (write-int32-hex-buffered *(ebp+0xc) %eax)
    # word-slice->start += len("loop")
    81 0/subop/add *edi 4/imm32/strlen
    # fall through
$subx-braces:emit-word-slice:
    # print(out, word-slice " ")
    (write-slice-buffered *(ebp+0xc) %edi)
    (write-buffered *(ebp+0xc) Space)
    # loop to next word
    e9/jump $subx-braces:word-loop/disp32
$subx-braces:next-line:
    # print(out, "\n")
    (write-buffered *(ebp+0xc) Newline)
    # loop to next line
    e9/jump $subx-braces:line-loop/disp32
$subx-braces:break:
    (flush *(ebp+0xc))
$subx-braces:end:
    # . reclaim locals
    81 0/subop/add %esp 0x29c/imm32
    # . restore registers
    5f/pop-to-edi
    5e/pop-to-esi
    5b/pop-to-ebx
    5a/pop-to-edx
    59/pop-to-ecx
    58/pop-to-eax
    # . epilogue
    89/<- %esp 5/r32/ebp
    5d/pop-to-ebp
    c3/return

test-subx-braces-passes-most-words-through:
    # . prologue
    55/push-ebp
    89/<- %ebp 4/r32/esp
    # setup
    (clear-stream _test-input-stream)
    (clear-stream _test-output-stream)
    (clear-stream $_test-input-buffered-file->buffer)
    (clear-stream $_test-output-buffered-file->buffer)
    # test
    (write _test-input-stream "== abcd 0x1")
    (subx-braces _test-input-buffered-file _test-output-buffered-file)
    # check that the line just passed through
    (flush _test-output-buffered-file)
#?     # dump _test-output-stream {{{
#?     (write 2 "^")
#?     (write-stream 2 _test-output-stream)
#?     (write 2 "$\n")
#?     # }}}
    (check-stream-equal _test-output-stream "== abcd 0x1 \n" "F - test-subx-braces-passes-most-words-through")
    # . epilogue
    89/<- %esp 5/r32/ebp
    5d/pop-to-ebp
    c3/return

test-subx-braces-1:
    # input:
    #   {
    #   ab break/imm32
    #   cd loop/imm32
    #   }
    #
    # output:
    #   _loop1:
    #   ab _break1/imm32
    #   cd _loop1/imm32
    #   _break1:
    #
    # . prologue
    55/push-ebp
    89/<- %ebp 4/r32/esp
    # setup
    (clear-stream _test-input-stream)
    (clear-stream _test-output-stream)
    (clear-stream $_test-input-buffered-file->buffer)
    (clear-stream $_test-output-buffered-file->buffer)
    # test
    (write _test-input-stream "{\nab break/imm32\ncd loop/imm32\n}")
    (subx-braces _test-input-buffered-file _test-output-buffered-file)
    # check that the line just passed through
    (flush _test-output-buffered-file)
#?     # dump _test-output-stream {{{
#?     (write 2 "^")
#?     (write-stream 2 _test-output-stream)
#?     (write 2 "$\n")
#?     # }}}
    (check-stream-equal _test-output-stream "_loop0x00000001:\nab _break0x00000001/imm32 \ncd _loop0x00000001/imm32 \n_break0x00000001:\n" "F - test-subx-braces-1")
    # . epilogue
    89/<- %esp 5/r32/ebp
    5d/pop-to-ebp
    c3/return

test-subx-braces-2:
    # input:
    #   {
    #   {
    #   ab break/imm32
    #   }
    #   cd loop/imm32
    #   }
    #
    # output:
    #   _loop1:
    #   _loop2:
    #   ab _break2/imm32
    #   _break2:
    #   cd _loop1/imm32
    #   _break1:
    #
    # . prologue
    55/push-ebp
    89/<- %ebp 4/r32/esp
    # setup
    (clear-stream _test-input-stream)
    (clear-stream _test-output-stream)
    (clear-stream $_test-input-buffered-file->buffer)
    (clear-stream $_test-output-buffered-file->buffer)
    # test
    (write _test-input-stream "{\n{\nab break/imm32\n}\ncd loop/imm32\n}")
    (subx-braces _test-input-buffered-file _test-output-buffered-file)
    # check that the line just passed through
    (flush _test-output-buffered-file)
#?     # dump _test-output-stream {{{
#?     (write 2 "^")
#?     (write-stream 2 _test-output-stream)
#?     (write 2 "$\n")
#?     # }}}
    (check-stream-equal _test-output-stream "_loop0x00000001:\n_loop0x00000002:\nab _break0x00000002/imm32 \n_break0x00000002:\ncd _loop0x00000001/imm32 \n_break0x00000001:\n" "F - test-subx-braces-2")
    # . epilogue
    89/<- %esp 5/r32/ebp
    5d/pop-to-ebp
    c3/return