about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * Removed ui_win_switch_numJames Booth2015-04-305-96/+76
| |
| * Added assert to ui_switch_winJames Booth2015-04-301-0/+1
| |
* | Merge branch 'master' into pgpJames Booth2015-04-303-27/+13
|\|
| * Removed some ui functions, inlinedJames Booth2015-04-303-27/+13
| |
* | Merge branch 'master' into pgpJames Booth2015-04-293-2/+8
|\|
| * Added ui_win_error_line()James Booth2015-04-293-2/+8
| |
* | Merge branch 'master' into pgpJames Booth2015-04-299-156/+120
|\|
| * Return result on OTR message sendingJames Booth2015-04-299-47/+63
| |
| * Return new window on new chat win eventJames Booth2015-04-293-12/+9
| |
| * Changed message when sending non encrypted message with OTR policy alwaysJames Booth2015-04-291-2/+2
| |
| * Reuse ui_new_chat_winJames Booth2015-04-291-55/+17
| |
| * _win_show_history takes ProfChatWin as first argJames Booth2015-04-291-66/+55
| |
* | Merge branch 'master' into pgpJames Booth2015-04-2813-277/+325
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Added ui events moduleJames Booth2015-04-285-16/+90
| |
| * Renamed event functionsJames Booth2015-04-2810-237/+237
| |
| * Removed commented codeJames Booth2015-04-281-26/+0
| |
* | Merge branch 'master' into pgpJames Booth2015-04-274-73/+89
|\|
| * Moved otr message send event to otr moduleJames Booth2015-04-273-33/+43
| |
| * Removed server_events dependency on libotr headersJames Booth2015-04-273-40/+46
| |
| * Renamed incoming otr messageJames Booth2015-04-271-6/+6
| |
* | Merge branch 'master' into pgpJames Booth2015-04-235-60/+79
|\| | | | | | | | | Conflicts: src/config/account.h
| * Tidied account loginJames Booth2015-04-235-60/+79
| |
* | Merge branch 'master' into pgpJames Booth2015-04-223-109/+132
|\|
| * Moved login events to client events moduleJames Booth2015-04-223-98/+121
| |
| * Tidy execute alias codeJames Booth2015-04-211-11/+11
| |
* | Merge branch 'master' into pgpJames Booth2015-04-217-61/+87
|\|
| * Moved new chat win events to client events moduleJames Booth2015-04-217-61/+87
| |
* | Merge branch 'master' into pgpJames Booth2015-04-213-50/+57
|\|
| * Moved all message sending to client events moduleJames Booth2015-04-213-50/+57
| |
* | Merge branch 'master' into pgpJames Booth2015-04-211-5/+0
|\|
| * Removed unused otr checkJames Booth2015-04-191-5/+0
| |
* | Merge branch 'master' into pgpJames Booth2015-04-193-77/+130
|\|
| * Added client_events module, reuse message sending code for all commandsJames Booth2015-04-193-77/+130
| |
* | Merge branch 'master' into pgpJames Booth2015-04-197-209/+209
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Renamed server event functionsJames Booth2015-04-197-207/+207
| |
* | Merge branch 'master' into pgpJames Booth2015-04-198-7/+7
|\|
| * Moved server_events to event/James Booth2015-04-198-7/+7
| |
* | Merge branch 'master' into pgpJames Booth2015-04-1212-21/+109
|\|
| * Added option to show jids in occupants panelJames Booth2015-04-1212-21/+109
| |
* | Merge branch 'master' into pgpJames Booth2015-04-113-9/+29
|\|
| * Autogenerate room name with UUID for /join with no argsJames Booth2015-04-113-9/+29
| |
* | Fixed message sending when not PGP key foundJames Booth2015-04-051-0/+2
| |
* | Merge branch 'master' into pgpJames Booth2015-03-296-10/+40
|\|
| * Use password for chat room invitesJames Booth2015-03-296-10/+40
| |
* | Merge branch 'master' into pgpJames Booth2015-03-293-4/+10
|\|
| * Added password to direct invitesJames Booth2015-03-293-4/+10
| |
* | Merge branch 'master' into pgpJames Booth2015-03-2910-29/+195
|\|
| * Add callback data to room disco info response handlerJames Booth2015-03-295-34/+102
| |
| * Set members only property when getting room featuresJames Booth2015-03-295-3/+25
| |
| * Added check members only room to send mediated invitesJames Booth2015-03-286-1/+77
| |
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-19 02:41:27 +0000
pan class="w"> a recipe unless they are also # results. Here we clearly modify both keyboard and screen, so we return # both. # # Here the console and screen are both 0, which usually indicates real # hardware rather than a fake for testing as you'll see below. 0/screen, 0/console <- chessboard 0/screen, 0/console close-console # cleanup screen, keyboard and mouse ] ## But enough about mu. Here's what it looks like to run the chessboard program. scenario print-board-and-read-move [ $close-trace # administrivia: most scenarios save and check traces, but this one gets too large/slow # we'll make the screen really wide because the program currently prints out a long line assume-screen 120/width, 20/height # initialize keyboard to type in a move assume-console [ type [a2-a4 ] ] run [ screen:address, console:address <- chessboard screen:address, console:address # icon for the cursor screen <- print-character screen, 9251/␣ ] screen-should-contain [ # 1 2 3 4 5 6 7 8 9 10 11 # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 .Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves. . . . .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | P . .3 | . .2 | P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . .Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>. . . . .Hit 'q' to exit. . . . .move: ␣ . . . . . ] ] ## Here's how 'chessboard' is implemented. recipe chessboard [ local-scope screen:address <- next-ingredient console:address <- next-ingredient board:address:array:address:array:character <- initial-position # hook up stdin stdin:address:channel <- new-channel 10/capacity start-running send-keys-to-channel:recipe, console, stdin, screen # buffer lines in stdin buffered-stdin:address:channel <- new-channel 10/capacity start-running buffer-lines:recipe, stdin, buffered-stdin { msg:address:array:character <- new [Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves. ] print-string screen, msg cursor-to-next-line screen print-board screen, board cursor-to-next-line screen msg <- new [Type in your move as <from square>-<to square>. For example: 'a2-a4'. Then press <enter>. ] print-string screen, msg cursor-to-next-line screen msg <- new [Hit 'q' to exit. ] print-string screen, msg { cursor-to-next-line screen msg <- new [move: ] print-string screen, msg m:address:move, quit:boolean, error:boolean <- read-move buffered-stdin, screen break-if quit, +quit:label buffered-stdin <- clear-channel buffered-stdin # cleanup after error. todo: test this? loop-if error } board <- make-move board, m clear-screen screen loop } +quit ] ## a board is an array of files, a file is an array of characters (squares) recipe new-board [ local-scope initial-position:address:array:number <- next-ingredient # assert(length(initial-position) == 64) len:number <- length *initial-position correct-length?:boolean <- equal len, 64 assert correct-length?, [chessboard had incorrect size] # board is an array of pointers to files; file is an array of characters board:address:array:address:array:character <- new location:type, 8 col:number <- copy 0 { done?:boolean <- equal col, 8 break-if done? file:address:address:array:character <- index-address *board, col *file <- new-file initial-position, col col <- add col, 1 loop } reply board ] recipe new-file [ local-scope position:address:array:number <- next-ingredient index:number <- next-ingredient index <- multiply index, 8 result:address:array:character <- new character:type, 8 row:number <- copy 0 { done?:boolean <- equal row, 8 break-if done? dest:address:character <- index-address *result, row *dest <- index *position, index row <- add row, 1 index <- add index, 1 loop } reply result ] recipe print-board [ local-scope screen:address <- next-ingredient board:address:array:address:array:character <- next-ingredient row:number <- copy 7 # start printing from the top of the board # print each row #? $print [printing board to screen ], screen, 10/newline { done?:boolean <- lesser-than row, 0 break-if done? #? $print [printing rank ], row, 10/newline # print rank number as a legend rank:number <- add row, 1 print-integer screen, rank s:address:array:character <- new [ | ] print-string screen, s # print each square in the row col:number <- copy 0 { done?:boolean <- equal col:number, 8 break-if done?:boolean f:address:array:character <- index *board, col c:character <- index *f, row print-character screen, c print-character screen, 32/space col <- add col, 1 loop } row <- subtract row, 1 cursor-to-next-line screen loop } # print file letters as legend #? $print [printing legend #? ] #? 1 s <- new [ +----------------] print-string screen, s screen <- cursor-to-next-line screen #? screen <- print-character screen, 97 #? 1 s <- new [ a b c d e f g h] screen <- print-string screen, s screen <- cursor-to-next-line screen #? $print [done printing board #? ] #? 1 ] # board:address:array:address:array:character <- initial-position recipe initial-position [ local-scope # layout in memory (in raster order): # R P _ _ _ _ p r # N P _ _ _ _ p n # B P _ _ _ _ p b # Q P _ _ _ _ p q # K P _ _ _ _ p k # B P _ _ _ _ p B # N P _ _ _ _ p n # R P _ _ _ _ p r initial-position:address:array:number <- new-array 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r, 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, 81/Q, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 113/q, 75/K, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 107/k, 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r #? 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r, #? 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, #? 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, #? 81/Q, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 113/q, #? 75/K, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 107/k, #? 66/B, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 98/b, #? 78/N, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 110/n, #? 82/R, 80/P, 32/blank, 32/blank, 32/blank, 32/blank, 112/p, 114/r board:address:array:address:array:character <- new-board initial-position reply board ] scenario printing-the-board [ assume-screen 30/width, 12/height run [ 1:address:array:address:array:character/board <- initial-position screen:address <- print-board screen:address, 1:address:array:address:array:character/board #? $dump-screen #? 1 ] screen-should-contain [ # 012345678901234567890123456789 .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | . .3 | . .2 | P P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . . . ] ] ## data structure: move container move [ # valid range: 0-7 from-file:number from-rank:number to-file:number to-rank:number ] # result:address:move, quit?:boolean, error?:boolean <- read-move stdin:address:channel, screen:address # prints only error messages to screen recipe read-move [ local-scope stdin:address:channel <- next-ingredient screen:address <- next-ingredient from-file:number, quit?:boolean, error?:boolean <- read-file stdin, screen reply-if quit?, 0/dummy, quit?, error? reply-if error?, 0/dummy, quit?, error? # construct the move object result:address:move <- new move:type x:address:number <- get-address *result, from-file:offset *x <- copy from-file x <- get-address *result, from-rank:offset *x, quit?, error? <- read-rank stdin, screen reply-if quit?, 0/dummy, quit?, error? reply-if error?, 0/dummy, quit?, error? error? <- expect-from-channel stdin, 45/dash, screen reply-if error?, 0/dummy, 0/quit, error? x <- get-address *result, to-file:offset *x, quit?, error? <- read-file stdin, screen reply-if quit?:boolean, 0/dummy, quit?:boolean, error?:boolean reply-if error?:boolean, 0/dummy, quit?:boolean, error?:boolean x:address:number <- get-address *result, to-rank:offset *x, quit?, error? <- read-rank stdin, screen reply-if quit?, 0/dummy, quit?, error? reply-if error?, 0/dummy, quit?, error? error? <- expect-from-channel stdin, 10/newline, screen reply-if error?, 0/dummy, 0/quit, error? reply result, quit?, error? ] # file:number, quit:boolean, error:boolean <- read-file stdin:address:channel, screen:address # valid values for file: 0-7 recipe read-file [ local-scope stdin:address:channel <- next-ingredient screen:address <- next-ingredient c:character, stdin <- read stdin { q-pressed?:boolean <- equal c, 81/Q break-unless q-pressed? reply 0/dummy, 1/quit, 0/error } { q-pressed? <- equal c, 113/q break-unless q-pressed? reply 0/dummy, 1/quit, 0/error } { empty-fake-keyboard?:boolean <- equal c, 0/eof break-unless empty-fake-keyboard? reply 0/dummy, 1/quit, 0/error } { newline?:boolean <- equal c, 10/newline break-unless newline? error-message:address:array:character <- new [that's not enough] print-string screen, error-message reply 0/dummy, 0/quit, 1/error } file:number <- subtract c, 97/a # 'a' <= file <= 'h' { above-min:boolean <- greater-or-equal file, 0 break-if above-min error-message:address:array:character <- new [file too low: ] print-string screen, error-message print-character screen, c cursor-to-next-line screen reply 0/dummy, 0/quit, 1/error } { below-max:boolean <- lesser-than file, 8 break-if below-max error-message <- new [file too high: ] print-string screen, error-message print-character screen, c reply 0/dummy, 0/quit, 1/error } reply file, 0/quit, 0/error ] # rank:number <- read-rank stdin:address:channel, screen:address # valid values: 0-7, -1 (quit), -2 (error) recipe read-rank [ local-scope stdin:address:channel <- next-ingredient screen:address <- next-ingredient c:character, stdin <- read stdin { q-pressed?:boolean <- equal c, 8/Q break-unless q-pressed? reply 0/dummy, 1/quit, 0/error } { q-pressed? <- equal c, 113/q break-unless q-pressed? reply 0/dummy, 1/quit, 0/error } { newline?:boolean <- equal c, 10 # newline break-unless newline? error-message:address:array:character <- new [that's not enough] print-string screen, error-message reply 0/dummy, 0/quit, 1/error } rank:number <- subtract c, 49/'1' # assert'1' <= rank <= '8' { above-min:boolean <- greater-or-equal rank, 0 break-if above-min error-message <- new [rank too low: ] print-string screen, error-message print-character screen, c reply 0/dummy, 0/quit, 1/error } { below-max:boolean <- lesser-or-equal rank, 7 break-if below-max error-message <- new [rank too high: ] print-string screen, error-message print-character screen, c reply 0/dummy, 0/quit, 1/error } reply rank, 0/quit, 0/error ] # read a character from the given channel and check that it's what we expect # return true on error recipe expect-from-channel [ local-scope stdin:address:channel <- next-ingredient expected:character <- next-ingredient screen:address <- next-ingredient c:character, stdin <- read stdin { match?:boolean <- equal c, expected break-if match? s:address:array:character <- new [expected character not found] print-string screen, s } result:boolean <- not match? reply result ] scenario read-move-blocking [ assume-screen 20/width, 2/height run [ 1:address:channel <- new-channel 2 2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address # 'read-move' is waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-blocking: routine failed to pause after coming up (before any keys were pressed)] # press 'a' 1:address:channel <- write 1:address:channel, 97/a restart 2:number/routine # 'read-move' still waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-blocking: routine failed to pause after rank 'a'] # press '2' 1:address:channel <- write 1:address:channel, 50/'2' restart 2:number/routine # 'read-move' still waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-blocking: routine failed to pause after file 'a2'] # press '-' 1:address:channel <- write 1:address:channel, 45/'-' restart 2:number/routine # 'read-move' still waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?/routine-state, [ F read-move-blocking: routine failed to pause after hyphen 'a2-'] # press 'a' 1:address:channel <- write 1:address:channel, 97/a restart 2:number/routine # 'read-move' still waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?/routine-state, [ F read-move-blocking: routine failed to pause after rank 'a2-a'] # press '4' 1:address:channel <- write 1:address:channel, 52/'4' restart 2:number/routine # 'read-move' still waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-blocking: routine failed to pause after file 'a2-a4'] # press 'newline' 1:address:channel <- write 1:address:channel, 10 # newline restart 2:number/routine # 'read-move' now completes wait-for-routine 2:number 3:number <- routine-state 2:number 4:boolean/completed? <- equal 3:number/routine-state, 1/completed assert 4:boolean/completed?, [ F read-move-blocking: routine failed to terminate on newline] trace 1, [test], [reached end] ] trace-should-contain [ test: reached end ] ] scenario read-move-quit [ assume-screen 20/width, 2/height run [ 1:address:channel <- new-channel 2 2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address # 'read-move' is waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-quit: routine failed to pause after coming up (before any keys were pressed)] # press 'q' 1:address:channel <- write 1:address:channel, 113/q restart 2:number/routine # 'read-move' completes wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/completed? <- equal 3:number/routine-state, 1/completed assert 4:boolean/completed?, [ F read-move-quit: routine failed to terminate on 'q'] trace 1, [test], [reached end] ] trace-should-contain [ test: reached end ] ] scenario read-move-illegal-file [ assume-screen 20/width, 2/height run [ 1:address:channel <- new-channel 2 2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address # 'read-move' is waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-file: routine failed to pause after coming up (before any keys were pressed)] 1:address:channel <- write 1:address:channel, 50/'2' restart 2:number/routine wait-for-routine 2:number ] screen-should-contain [ .file too low: 2 . . . ] ] scenario read-move-illegal-rank [ assume-screen 20/width, 2/height run [ 1:address:channel <- new-channel 2 2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address # 'read-move' is waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-file: routine failed to pause after coming up (before any keys were pressed)] 1:address:channel <- write 1:address:channel, 97/a 1:address:channel <- write 1:address:channel, 97/a restart 2:number/routine wait-for-routine 2:number ] screen-should-contain [ .rank too high: a . . . ] ] scenario read-move-empty [ assume-screen 20/width, 2/height run [ 1:address:channel <- new-channel 2 2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address # 'read-move' is waiting for input wait-for-routine 2:number 3:number <- routine-state 2:number/id 4:boolean/waiting? <- equal 3:number/routine-state, 3/waiting assert 4:boolean/waiting?, [ F read-move-file: routine failed to pause after coming up (before any keys were pressed)] 1:address:channel <- write 1:address:channel, 10/newline 1:address:channel <- write 1:address:channel, 97/a restart 2:number/routine wait-for-routine 2:number ] screen-should-contain [ .that's not enough . . . ] ] recipe make-move [ local-scope b:address:array:address:array:character <- next-ingredient m:address:move <- next-ingredient from-file:number <- get *m, from-file:offset from-rank:number <- get *m, from-rank:offset to-file:number <- get *m, to-file:offset to-rank:number <- get *m, to-rank:offset f:address:array:character <- index *b, from-file src:address:character/square <- index-address *f, from-rank f <- index *b, to-file dest:address:character/square <- index-address *f, to-rank *dest <- copy *src *src <- copy 32/space reply b/same-as-ingredient:0 ] scenario making-a-move [ assume-screen 30/width, 12/height run [ 2:address:array:address:array:character/board <- initial-position 3:address:move <- new move:type 4:address:number <- get-address *3:address:move, from-file:offset *4:address:number <- copy 6/g 5:address:number <- get-address *3:address:move, from-rank:offset *5:address:number <- copy 1/'2' 6:address:number <- get-address *3:address:move, to-file:offset *6:address:number <- copy 6/g 7:address:number <- get-address *3:address:move, to-rank:offset *7:address:number <- copy 3/'4' 2:address:array:address:array:character/board <- make-move 2:address:array:address:array:character/board, 3:address:move screen:address <- print-board screen:address, 2:address:array:address:array:character/board ] screen-should-contain [ # 012345678901234567890123456789 .8 | r n b q k b n r . .7 | p p p p p p p p . .6 | . .5 | . .4 | P . .3 | . .2 | P P P P P P P . .1 | R N B Q K B N R . . +---------------- . . a b c d e f g h . . . ] ]
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-19 02:41:26 +0000