about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* removed UML stuff, it's uselesshut2010-03-3115-2337/+0
|
* TODO: closed #45, it was implemented alreadyhut2010-03-311-1/+1
|
* fsobject.directory: don't load if it doesnt existhut2010-03-311-0/+1
|
* clean uphut2010-03-312-2/+0
|
* fsobject.file: read more than 4 bytes for is_binaryhut2010-03-311-9/+6
|
* removed debug stuffhut2010-03-301-2/+0
|
* ext.signal_dispatcher: fixed weak refs to bound methodshut2010-03-302-7/+23
|
* fixed memory leakhut2010-03-307-35/+53
|
* tc_signal: added more tests (some still fail!)hut2010-03-302-10/+74
|
* gui.colorscheme: fixed circular importhut2010-03-302-73/+71
|
* added RegexpSignalDispatcher though im not sure if ill use ithut2010-03-302-1/+96
|
* implemented settings with signalshut2010-03-301-88/+135
|
* added SignalDispatcher classhut2010-03-303-1/+161
|
* schedule even small directories for more fluent scrollinghut2010-03-301-1/+1
|
* ranger.main: use metavars with optparsehut2010-03-301-12/+5
|
* README: updatedhut2010-03-291-1/+1
|
* Changed mouse wheel behaviourhut2010-03-292-11/+3
| | | | | | | | | | | | | | | | I want the mouse wheel to do two things: * Move exactly one item up/down * Yet allow me to scroll around quickly Previously I thought its not possible to get both, but here's a nice compromise: Always move one item at a time, but whenever it's possible, (when there is enough room), scroll three times as far as you move. This at least allows you to scroll up quickly if the cursor is at the top and vice versa. To scroll faster, hold CTRL while scrolling.
* defaults.apps: add the 'd' flag to pdf readershut2010-03-291-0/+1
|
* removed the cd-after-exit hackhut2010-03-296-190/+22
| | | | | | | | | Fear not. You still get the same functionality by using a function like: ranger() { $(which ranger) $@ && cd "$(grep \^\' ~/.ranger/bookmarks | cut -b3-)" }
* README: Removed the reference to code/keys.rb >_<hut2010-03-291-2/+2
|
* defaults.commands: fixed find commandhut2010-03-291-0/+1
| | | | | you can now press "n" and get to the next item as if you were searching with the SearchConsole after an unsuccessful find.
* closed issue #76 (was implemented in f5e9c01e)hut2010-03-291-1/+1
|
* fixed --clean, which was violated in ranger.shared.settingshut2010-03-291-6/+9
|
* added option "save_console_history"hut2010-03-294-7/+33
|
* core.environment: don't GC directories which you're in. lolhut2010-03-281-1/+1
|
* new option: colorscheme_overlayhut2010-03-285-0/+38
| | | | | For those who want small colorscheme changes without creating an extra file.
* revert a part of 103a23b8hut2010-03-281-1/+1
|
* colorschemes.default: *slight* performance improvementhut2010-03-281-1/+1
|
* fsobject.directory: forgot to rename attributeshut2010-03-281-2/+2
|
* renamed three options, display a warning if the old ones are usedhut2010-03-286-26/+43
| | | | | | reverse => sort_reverse directories_first => sort_directories_first case_insensitive => sort_case_insensitive
* added an extra option: draw_bookmark_bordershut2010-03-283-1/+3
|
* fsobject.directory: little optimization in sortinghut2010-03-281-2/+2
| | | | | | | | | 1. no need to call path.basename.lower() since it's cached in path.basename_lower. 2. no need to convert a bool to int for arithmetic operations 3. path.is_directory is faster than an isinstance() check
* add case_insensitive setting for directory sort orderLucas de Vries2010-03-284-2/+17
|
* defaults.keys: also map ZQ to exitLucas de Vries2010-03-281-1/+1
|
* widgets.browserview: only display bookmarks border if draw_borders is onLucas de Vries2010-03-281-4/+7
|
* widgets.browserview: improved bookmark preview borderhut2010-03-281-3/+4
| | | | skip drawing of the right border if its too wide
* widgets.browserview: fix unicode issue when drawing bookmarkshut2010-03-281-1/+4
|
* defaults.keys: draw bookmarks when typing "um"hut2010-03-281-1/+1
|
* widgets.browserview: draw a border around bookmark listhut2010-03-281-2/+5
|
* commands: don't ask for confirmation when deleting single linkshut2010-03-281-2/+5
|
* closed issue #70: mouse click handler for the titlebarhut2010-03-282-1/+21
|
* closed issue #71hut2010-03-283-4/+48
|
* slightly changed default colorschemehut2010-03-281-1/+2
|
* todo: updatedhut2010-03-281-0/+2
|
* closed #73, reason was it didn't move and coords didnt get updatedhut2010-03-272-2/+4
|
* closed #40 for nowhut2010-03-271-2/+2
|
* fixed bug in defaults.appshut2010-03-271-7/+10
| | | | | | Sometimes, maybe when a directory is GCed while youre inside, it shows a "NoneType is not iterable" error when trying to open images
* fixed #74 and closed #67 (was fixed earlier)hut2010-03-272-4/+8
|
* gui.ui: corrected docstringhut2010-03-271-1/+1
|
* ranger.__main__: setlocale fixhut2010-03-261-3/+4
|
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-04 22:17:01 +0000
pan>right for the # sandbox. def! main [ local-scope open-console env:&:environment <- new-programming-environment 0/filesystem, 0/screen render-all 0/screen, env, render event-loop 0/screen, 0/console, env, 0/filesystem # never gets here ] container environment [ recipes:&:editor current-sandbox:&:editor sandbox-in-focus?:bool # false => cursor in recipes; true => cursor in current-sandbox ] def new-programming-environment resources:&:resources, screen:&:screen, test-sandbox-editor-contents:text -> result:&:environment [ local-scope load-ingredients width:num <- screen-width screen result <- new environment:type # recipe editor on the left initial-recipe-contents:text <- slurp resources, [lesson/recipes.mu] # ignore errors divider:num, _ <- divide-with-remainder width, 2 recipes:&:editor <- new-editor initial-recipe-contents, 0/left, divider/right # sandbox editor on the right sandbox-left:num <- add divider, 1 current-sandbox:&:editor <- new-editor test-sandbox-editor-contents, sandbox-left, width/right *result <- put *result, recipes:offset, recipes *result <- put *result, current-sandbox:offset, current-sandbox *result <- put *result, sandbox-in-focus?:offset, 0/false <programming-environment-initialization> ] def event-loop screen:&:screen, console:&:console, env:&:environment, resources:&:resources -> screen:&:screen, console:&:console, env:&:environment, resources:&:resources [ local-scope load-ingredients recipes:&:editor <- get *env, recipes:offset current-sandbox:&:editor <- get *env, current-sandbox:offset sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset # if we fall behind we'll stop updating the screen, but then we have to # render the entire screen when we catch up. # todo: test this render-all-on-no-more-events?:bool <- copy 0/false { # looping over each (keyboard or touch) event as it occurs +next-event e:event, found?:bool, quit?:bool, console <- read-event console loop-unless found? break-if quit? # only in tests trace 10, [app], [next-event] <handle-event> # check for global events that will trigger regardless of which editor has focus { k:num, is-keycode?:bool <- maybe-convert e:event, keycode:variant break-unless is-keycode? <global-keypress> } { c:char, is-unicode?:bool <- maybe-convert e:event, text:variant break-unless is-unicode? <global-type> } # 'touch' event - send to both sides, see what picks it up { t:touch-event, is-touch?:bool <- maybe-convert e:event, touch:variant break-unless is-touch? # ignore all but 'left-click' events for now # todo: test this touch-type:num <- get t, type:offset is-left-click?:bool <- equal touch-type, 65513/mouse-left loop-unless is-left-click?, +next-event click-row:num <- get t, row:offset click-column:num <- get t, column:offset # later exceptions for non-editor touches will go here <global-touch> # send to both editors _ <- move-cursor-in-editor screen, recipes, t sandbox-in-focus?:bool <- move-cursor-in-editor screen, current-sandbox, t *env <- put *env, sandbox-in-focus?:offset, sandbox-in-focus? screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env loop +next-event } # 'resize' event - redraw editor # todo: test this after supporting resize in assume-console { r:resize-event, is-resize?:bool <- maybe-convert e:event, resize:variant break-unless is-resize? # if more events, we're still resizing; wait until we stop more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event } { break-if more-events? env, screen <- resize screen, env screen <- render-all screen, env, render-without-moving-cursor render-all-on-no-more-events? <- copy 0/false # full render done } loop +next-event } # if it's not global and not a touch event, send to appropriate editor { hide-screen screen sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset { break-if sandbox-in-focus? render?:bool <- handle-keyboard-event screen, recipes, e:event # refresh screen only if no more events # if there are more events to process, wait for them to clear up, then make sure you render-all afterward. more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event jump +finish-event } { break-if more-events? { break-unless render-all-on-no-more-events? # no more events, and we have to force render screen <- render-all screen, env, render render-all-on-no-more-events? <- copy 0/false jump +finish-event } # no more events, no force render { break-unless render? screen <- render-recipes screen, env, render jump +finish-event } } } { break-unless sandbox-in-focus? render?:bool <- handle-keyboard-event screen, current-sandbox, e:event # refresh screen only if no more events # if there are more events to process, wait for them to clear up, then make sure you render-all afterward. more-events?:bool <- has-more-events? console { break-unless more-events? render-all-on-no-more-events? <- copy 1/true # no rendering now, full rendering on some future event jump +finish-event } { break-if more-events? { break-unless render-all-on-no-more-events? # no more events, and we have to force render screen <- render-all screen, env, render render-all-on-no-more-events? <- copy 0/false jump +finish-event } # no more events, no force render { break-unless render? screen <- render-sandbox-side screen, env, render jump +finish-event } } } +finish-event screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env show-screen screen } loop } ] def resize screen:&:screen, env:&:environment -> env:&:environment, screen:&:screen [ local-scope load-ingredients clear-screen screen # update screen dimensions width:num <- screen-width screen divider:num, _ <- divide-with-remainder width, 2 # update recipe editor recipes:&:editor <- get *env, recipes:offset right:num <- subtract divider, 1 *recipes <- put *recipes, right:offset, right # reset cursor (later we'll try to preserve its position) *recipes <- put *recipes, cursor-row:offset, 1 *recipes <- put *recipes, cursor-column:offset, 0 # update sandbox editor current-sandbox:&:editor <- get *env, current-sandbox:offset left:num <- add divider, 1 *current-sandbox <- put *current-sandbox, left:offset, left right:num <- subtract width, 1 *current-sandbox <- put *current-sandbox, right:offset, right # reset cursor (later we'll try to preserve its position) *current-sandbox <- put *current-sandbox, cursor-row:offset, 1 *current-sandbox <- put *current-sandbox, cursor-column:offset, left ] # Variant of 'render' that updates cursor-row and cursor-column based on # before-cursor (rather than the other way around). If before-cursor moves # off-screen, it resets cursor-row and cursor-column. def render-without-moving-cursor screen:&:screen, editor:&:editor -> last-row:num, last-column:num, screen:&:screen, editor:&:editor [ local-scope load-ingredients return-unless editor, 1/top, 0/left left:num <- get *editor, left:offset screen-height:num <- screen-height screen right:num <- get *editor, right:offset curr:&:duplex-list:char <- get *editor, top-of-screen:offset prev:&:duplex-list:char <- copy curr # just in case curr becomes null and we can't compute prev curr <- next curr +render-loop-initialization color:num <- copy 7/white row:num <- copy 1/top column:num <- copy left # save before-cursor old-before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset # initialze cursor-row/cursor-column/before-cursor to the top of the screen # by default *editor <- put *editor, cursor-row:offset, row *editor <- put *editor, cursor-column:offset, column top-of-screen:&:duplex-list:char <- get *editor, top-of-screen:offset *editor <- put *editor, before-cursor:offset, top-of-screen screen <- move-cursor screen, row, column { +next-character break-unless curr off-screen?:bool <- greater-or-equal row, screen-height break-if off-screen? # if we find old-before-cursor still on the new resized screen, update # editor.cursor-row and editor.cursor-column based on # old-before-cursor { at-cursor?:bool <- equal old-before-cursor, prev break-unless at-cursor? *editor <- put *editor, cursor-row:offset, row *editor <- put *editor, cursor-column:offset, column *editor <- put *editor, before-cursor:offset, old-before-cursor } c:char <- get *curr, value:offset <character-c-received> { # newline? move to left rather than 0 newline?:bool <- equal c, 10/newline break-unless newline? # clear rest of line in this window clear-line-until screen, right # skip to next line row <- add row, 1 column <- copy left screen <- move-cursor screen, row, column curr <- next curr prev <- next prev loop +next-character } { # at right? wrap. even if there's only one more letter left; we need # room for clicking on the cursor after it. at-right?:bool <- equal column, right break-unless at-right? # print wrap icon wrap-icon:char <- copy 8617/loop-back-to-left print screen, wrap-icon, 245/grey column <- copy left row <- add row, 1 screen <- move-cursor screen, row, column # don't increment curr loop +next-character } print screen, c, color curr <- next curr prev <- next prev column <- add column, 1 loop } # save first character off-screen *editor <- put *editor, bottom-of-screen:offset, curr *editor <- put *editor, bottom:offset, row return row, column ] scenario point-at-multiple-editors [ local-scope trace-until 100/app # trace too long assume-screen 30/width, 5/height # initialize both halves of screen assume-resources [ [lesson/recipes.mu] <- [ |abc| ] ] env:&:environment <- new-programming-environment resources, screen, [def] # contents of sandbox editor # focus on both sides assume-console [ left-click 1, 1 left-click 1, 17 ] # check cursor column in each run [ event-loop screen, console, env, resources recipes:&:editor <- get *env, recipes:offset 5:num/raw <- get *recipes, cursor-column:offset sandbox:&:editor <- get *env, current-sandbox:offset 7:num/raw <- get *sandbox, cursor-column:offset ] memory-should-contain [ 5 <- 1 7 <- 17 ] ] scenario edit-multiple-editors [ local-scope trace-until 100/app # trace too long assume-screen 30/width, 5/height # initialize both halves of screen assume-resources [ [lesson/recipes.mu] <- [ |abc| ] ] env:&:environment <- new-programming-environment resources, screen, [def] # contents of sandbox render-all screen, env, render # type one letter in each of them assume-console [ left-click 1, 1 type [0] left-click 1, 17 type [1] ] run [ event-loop screen, console, env, resources recipes:&:editor <- get *env, recipes:offset 5:num/raw <- get *recipes, cursor-column:offset sandbox:&:editor <- get *env, current-sandbox:offset 7:num/raw <- get *sandbox, cursor-column:offset ] screen-should-contain [ . run (F4) . # this line has a different background, but we don't test that yet .a0bc ┊d1ef . . ┊──────────────. .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . . ┊ . ] memory-should-contain [ 5 <- 2 # cursor column of recipe editor 7 <- 18 # cursor column of sandbox editor ] # show the cursor at the right window run [ cursor:char <- copy 9251/␣ print screen, cursor ] screen-should-contain [ . run (F4) . .a0bc ┊d1␣f . . ┊──────────────. .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . . ┊ . ] ] scenario editor-in-focus-keeps-cursor [ local-scope trace-until 100/app # trace too long assume-screen 30/width, 5/height assume-resources [ [lesson/recipes.mu] <- [ |abc| ] ] env:&:environment <- new-programming-environment resources, screen, [def] render-all screen, env, render # initialize programming environment and highlight cursor assume-console [] run [ event-loop screen, console, env, resources cursor:char <- copy 9251/␣ print screen, cursor ] # is cursor at the right place? screen-should-contain [ . run (F4) . .␣bc ┊def . . ┊──────────────. .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . . ┊ . ] # now try typing a letter assume-console [ type [z] ] run [ event-loop screen, console, env, resources cursor:char <- copy 9251/␣ print screen, cursor ] # cursor should still be right screen-should-contain [ . run (F4) . .z␣bc ┊def . . ┊──────────────. .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊ . . ┊ . ] ] scenario backspace-in-sandbox-editor-joins-lines [ local-scope trace-until 100/app # trace too long assume-screen 30/width, 5/height assume-resources [ ] # initialize sandbox side with two lines test-sandbox-editor-contents:text <- new [abc def] env:&:environment <- new-programming-environment resources, screen, test-sandbox-editor-contents render-all screen, env, render screen-should-contain [ . run (F4) . . ┊abc . .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊def . . ┊──────────────. . ┊ . ] # position cursor at start of second line and hit backspace assume-console [ left-click 2, 16 press backspace ] run [ event-loop screen, console, env, resources cursor:char <- copy 9251/␣ print screen, cursor ] # cursor moves to end of old line screen-should-contain [ . run (F4) . . ┊abc␣ef . .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊──────────────. . ┊ . ] ] def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ local-scope load-ingredients trace 10, [app], [render all] hide-screen screen # top menu trace 11, [app], [render top menu] width:num <- screen-width screen draw-horizontal screen, 0, 0/left, width, 32/space, 0/black, 238/grey button-start:num <- subtract width, 20 button-on-screen?:bool <- greater-or-equal button-start, 0 assert button-on-screen?, [screen too narrow for menu] screen <- move-cursor screen, 0/row, button-start print screen, [ run (F4) ], 255/white, 161/reddish # dotted line down the middle trace 11, [app], [render divider] divider:num, _ <- divide-with-remainder width, 2 height:num <- screen-height screen draw-vertical screen, divider, 1/top, height, 9482/vertical-dotted # screen <- render-recipes screen, env, render-editor screen <- render-sandbox-side screen, env, render-editor <render-components-end> # recipes:&:editor <- get *env, recipes:offset current-sandbox:&:editor <- get *env, current-sandbox:offset sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env # show-screen screen ] def render-recipes screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ local-scope load-ingredients trace 11, [app], [render recipes] recipes:&:editor <- get *env, recipes:offset # render recipes left:num <- get *recipes, left:offset right:num <- get *recipes, right:offset row:num, column:num, screen <- call render-editor, screen, recipes clear-line-until screen, right row <- add row, 1 <render-recipe-components-end> # draw dotted line after recipes draw-horizontal screen, row, left, right, 9480/horizontal-dotted row <- add row, 1 clear-screen-from screen, row, left, left, right ] # replaced in a later layer def render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ local-scope load-ingredients current-sandbox:&:editor <- get *env, current-sandbox:offset left:num <- get *current-sandbox, left:offset right:num <- get *current-sandbox, right:offset row:num, column:num, screen, current-sandbox <- call render-editor, screen, current-sandbox clear-line-until screen, right row <- add row, 1 # draw solid line after code (you'll see why in later layers) draw-horizontal screen, row, left, right row <- add row, 1 clear-screen-from screen, row, left, left, right ] def update-cursor screen:&:screen, recipes:&:editor, current-sandbox:&:editor, sandbox-in-focus?:bool, env:&:environment -> screen:&:screen [ local-scope load-ingredients <update-cursor-special-cases> { break-if sandbox-in-focus? cursor-row:num <- get *recipes, cursor-row:offset cursor-column:num <- get *recipes, cursor-column:offset } { break-unless sandbox-in-focus? cursor-row:num <- get *current-sandbox, cursor-row:offset cursor-column:num <- get *current-sandbox, cursor-column:offset } screen <- move-cursor screen, cursor-row, cursor-column ] # like 'render' for texts, but with colorization for comments like in the editor def render-code screen:&:screen, s:text, left:num, right:num, row:num -> row:num, screen:&:screen [ local-scope load-ingredients return-unless s color:num <- copy 7/white column:num <- copy left screen <- move-cursor screen, row, column screen-height:num <- screen-height screen i:num <- copy 0 len:num <- length *s { +next-character done?:bool <- greater-or-equal i, len break-if done? done? <- greater-or-equal row, screen-height break-if done? c:char <- index *s, i <character-c-received> # only line different from render { # at right? wrap. at-right?:bool <- equal column, right break-unless at-right? # print wrap icon wrap-icon:char <- copy 8617/loop-back-to-left print screen, wrap-icon, 245/grey column <- copy left row <- add row, 1 screen <- move-cursor screen, row, column loop +next-character # retry i } i <- add i, 1 { # newline? move to left rather than 0 newline?:bool <- equal c, 10/newline break-unless newline? # clear rest of line in this window { done?:bool <- greater-than column, right break-if done? space:char <- copy 32/space print screen, space column <- add column, 1 loop } row <- add row, 1 column <- copy left screen <- move-cursor screen, row, column loop +next-character } print screen, c, color column <- add column, 1 loop } was-at-left?:bool <- equal column, left clear-line-until screen, right { break-if was-at-left? row <- add row, 1 } move-cursor screen, row, left ] # ctrl-l - redraw screen (just in case it printed junk somehow) after <global-type> [ { redraw-screen?:bool <- equal c, 12/ctrl-l break-unless redraw-screen? screen <- render-all screen, env:&:environment, render sync-screen screen loop +next-event } ] # ctrl-n - switch focus # todo: test this after <global-type> [ { switch-side?:bool <- equal c, 14/ctrl-n break-unless switch-side? sandbox-in-focus?:bool <- get *env, sandbox-in-focus?:offset sandbox-in-focus? <- not sandbox-in-focus? *env <- put *env, sandbox-in-focus?:offset, sandbox-in-focus? screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env loop +next-event } ] ## helpers def draw-vertical screen:&:screen, col:num, y:num, bottom:num -> screen:&:screen [ local-scope load-ingredients style:char, style-found?:bool <- next-ingredient { break-if style-found? style <- copy 9474/vertical } color:num, color-found?:bool <- next-ingredient { # default color to white break-if color-found? color <- copy 245/grey } { continue?:bool <- lesser-than y, bottom break-unless continue? screen <- move-cursor screen, y, col print screen, style, color y <- add y, 1 loop } ]
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-04 22:17:01 +0000