summary refs log tree commit diff stats
path: root/Makefile
blob: 60de648758fa4400e112a428d2ca5dd8f5bccb35 (plain) (blame)
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
NAME = ranger
VERSION = 1.0.4
PYTHON ?= python
DOCDIR ?= doc/pydoc
PREFIX ?= /usr/local
PYTHONOPTIMIZE ?= 1
CWD = $(shell pwd)
EDITOR ?= vim
DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \
	[p for p in sys.path if "site" in p][0])' 2> /dev/null)/ranger

.PHONY: all compile clean doc cleandoc edit push test commit \
	install uninstall info snapshot minimal_snapshot

info:
	@echo 'This makefile provides shortcuts for common tasks.'
	@echo 'make clean: Remove all unnecessary files (.pyc, .pyo)'
	@echo 'make cleandoc: Remove the pydoc documentation'
	@echo 'make doc: Create the pydoc documentation'
	@echo 'make install: Install ranger'
	@echo 'make snapshot: Create a tar.gz of the current git revision'
	@echo
	@echo 'For developers:'
	@echo 'make commit: Test and commit the changes'
	@echo 'make test: Run all unittests.'
	@echo 'make push: push the changes via git'
	@echo 'make edit: open all relevant files in your editor'

all: test install

compile: clean
	@echo 'Compiling...'
	PYTHONOPTIMIZE=$(PYTHONOPTIMIZE) python -m compileall -q ranger

doc: cleandoc
	mkdir -p $(DOCDIR)
	cd $(DOCDIR); \
		$(PYTHON) -c 'import pydoc, sys; \
		sys.path[0] = "$(CWD)"; \
		pydoc.writedocs("$(CWD)")'

uninstall:
	@echo 'To uninstall ranger, please remove these files:'
	@echo $(DEST)'/*'
	@echo $(PREFIX)'/bin/ranger'
	@echo 'and optionally the config files at:'
	@echo '~/.ranger'

install: compile
	@if [ '$(DEST)' == '/ranger' ]; then \
		echo 'Cannot find a suitable destination for the files.'; \
		false; \
	fi
	@echo "Installing..."
	cp ranger.py $(PREFIX)/bin/ranger
	cp -ruT ranger $(DEST)
	chmod 755 $(PREFIX)/bin/ranger
	chmod -R +rX $(DEST)
	@echo '--------------------------------------'
	@echo 'Finished.'
	@echo 'If you use BASH or ZSH, you can activate an extra feature now:'
	@echo 'When you exit ranger, the directory of the current shell can be'
	@echo 'changed to the last visited directory in ranger.  To do so, add'
	@echo 'this alias to your shell rc file (like ~/.bashrc):'
	@echo 'alias rng="source ranger ranger"'
	@echo 'And run ranger by typing rng.'


cleandoc:
	test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html

clean:
	find . -regex .\*.py[co]$ | xargs rm -f --

test: clean
	./all_tests.py

edit:
	@$(EDITOR) ranger.py Makefile README COPYING HACKING INSTALL $(shell find ranger test -regex .\*py$ )

push:
	@for repo in $(shell git remote); do \
		echo "Pushing to $$repo..."; \
		git push $$repo master; \
	done

commit: test
	@git citool

snapshot:
	git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-list HEAD | head -n 1 | cut -b 1-8).tar.gz

minimal_snapshot:
	@echo 'This is not quite working well. I will abort now' && false
	git checkout -b no_help
	git rm -rf doc
	git rm -rf test
	git rm all_tests.py
	git rm TODO
	git commit -a -m'removed documentation'
	git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-list HEAD | head -n 1 | cut -b 1-8).tar.gz
	git reset --hard no_help^
	git branch -D no_help
9;rectangle', 'square' -- p1, p2 for mode 'line' -- p1, p2, arrow-mode for mode 'arrow-line' -- center, radius for mode 'circle' -- center, radius, start_angle, end_angle for mode 'arc' -- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide -- The field names are carefully chosen so that switching modes in midstream -- remembers previously entered points where that makes sense. Lines = {{mode='text', data=''}} -- Lines can be too long to fit on screen, in which case they _wrap_ into -- multiple _screen lines_. -- -- Therefore, any potential location for the cursor can be described in two ways: -- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units) -- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line. -- -- Most of the time we'll only persist positions in schema 1, translating to -- schema 2 when that's convenient. Screen_top1 = {line=1, pos=1} -- position of start of screen line at top of screen Cursor1 = {line=1, pos=1} -- position of cursor Screen_bottom1 = {line=1, pos=1} -- position of start of screen line at bottom of screen Selection1 = {} Recent_mouse = {} -- when selecting text, avoid recomputing some state on every single frame Cursor_x, Cursor_y = 0, 0 -- in pixels Current_drawing_mode = 'line' Previous_drawing_mode = nil -- values for tests Font_height = 14 Line_height = 15 Margin_top = 15 Filename = love.filesystem.getUserDirectory()..'/lines.txt' -- undo History = {} Next_history = 1 -- search Search_term = nil Search_text = nil Search_backup = nil -- stuff to restore when cancelling search -- resize Last_resize_time = nil end -- App.initialize_globals function App.initialize(arg) love.keyboard.setTextInput(true) -- bring up keyboard on touch screen love.keyboard.setKeyRepeat(true) if arg[1] == '-geometry' then initialize_window_geometry(arg[2]) table.remove(arg, 2) table.remove(arg, 1) else initialize_window_geometry() end initialize_font_settings(20) if #arg > 0 then Filename = arg[1] end Lines = load_from_disk(Filename) for i,line in ipairs(Lines) do if line.mode == 'text' then Cursor1.line = i break end end love.window.setTitle('lines.love - '..Filename) if #arg > 1 then print('ignoring commandline args after '..arg[1]) end end -- App.initialize function initialize_window_geometry(geometry_spec) local geometry_initialized if geometry_spec then geometry_initialized = parse_geometry_spec(geometry_spec) end if not geometry_initialized then -- maximize window love.window.setMode(0, 0) -- maximize App.screen.width, App.screen.height, App.screen.flags = love.window.getMode() -- shrink slightly to account for window decoration App.screen.width = App.screen.width-100 App.screen.height = App.screen.height-100 end App.screen.flags.resizable = true App.screen.flags.minwidth = math.min(App.screen.width, 200) App.screen.flags.minheight = math.min(App.screen.width, 200) love.window.updateMode(App.screen.width, App.screen.height, App.screen.flags) end function parse_geometry_spec(geometry_spec) local width, height, x, y = geometry_spec:match('(%d+)x(%d+)%+(%d+)%+(%d+)') if width == nil then print('invalid geometry spec: '..geometry_spec) print('expected format: {width}x{height}+{x}+{y}') return false end App.screen.width = math.floor(tonumber(width)) App.screen.height = math.floor(tonumber(height)) App.screen.flags = {x=math.floor(tonumber(x)), y=math.floor(tonumber(y))} return true end function love.resize(w, h) --? print(("Window resized to width: %d and height: %d."):format(w, h)) App.screen.width, App.screen.height = w, h Line_width = math.min(40*App.width(Em), App.screen.width-50) Text.redraw_all() Last_resize_time = love.timer.getTime() end function initialize_font_settings(font_height) Font_height = font_height love.graphics.setFont(love.graphics.newFont(Font_height)) Line_height = math.floor(font_height*1.3) -- maximum width available to either text or drawings, in pixels Em = App.newText(love.graphics.getFont(), 'm') -- readable text width is 50-75 chars Line_width = math.min(40*App.width(Em), App.screen.width-50) end function App.filedropped(file) App.initialize_globals() -- in particular, forget all undo history Filename = file:getFilename() file:open('r') Lines = load_from_file(file) file:close() for i,line in ipairs(Lines) do if line.mode == 'text' then Cursor1.line = i break end end love.window.setTitle('Text with Lines - '..Filename) end function App.draw() Button_handlers = {} love.graphics.setColor(1, 1, 1) love.graphics.rectangle('fill', 0, 0, App.screen.width-1, App.screen.height-1) love.graphics.setColor(0, 0, 0) -- some hysteresis while resizing if Last_resize_time then if love.timer.getTime() - Last_resize_time < 0.1 then return else Last_resize_time = nil end end assert(Text.le1(Screen_top1, Cursor1)) local y = Margin_top --? print('== draw') for line_index,line in ipairs(Lines) do --? print('draw:', y, line_index, line) if y + Line_height > App.screen.height then break end --? print('a') if line_index >= Screen_top1.line then Screen_bottom1.line = line_index if line.mode == 'text' and line.data == '' then line.y = y button('draw', {x=4,y=y+4, w=12,h=12, color={1,1,0}, icon = icon.insert_drawing, onpress1 = function() Drawing.before = snapshot() table.insert(Lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}}) if Cursor1.line >= line_index then Cursor1.line = Cursor1.line+1 end end}) if Search_term == nil then if line_index == Cursor1.line then Text.draw_cursor(25, y) end end Screen_bottom1.pos = Screen_top1.pos y = y + Line_height elseif line.mode == 'drawing' then y = y+10 -- padding line.y = y Drawing.draw(line) y = y + Drawing.pixels(line.h) + 10 -- padding else --? print('text') line.y = y y, Screen_bottom1.pos = Text.draw(line, Line_width, line_index) y = y + Line_height --? print('=> y', y) end end end --? print('screen bottom: '..tostring(Screen_bottom1.pos)..' in '..tostring(Lines[Screen_bottom1.line].data)) if Search_term then Text.draw_search_bar() end end function App.update(dt) -- some hysteresis while resizing if Last_resize_time then if love.timer.getTime() - Last_resize_time < 0.1 then return else Last_resize_time = nil end end Drawing.update(dt) end function App.mousepressed(x,y, mouse_button) if Search_term then return end propagate_to_button_handlers(x,y, mouse_button) for line_index,line in ipairs(Lines) do if line.mode == 'text' then if Text.in_line(line, x,y) then if App.shift_down() then Selection1 = {line=Cursor1.line, pos=Cursor1.pos} end Cursor1.line = line_index Cursor1.pos = Text.to_pos_on_line(line, x, y) if not App.shift_down() then Selection1 = {line=Cursor1.line, pos=Cursor1.pos} end end elseif line.mode == 'drawing' then if Drawing.in_drawing(line, x, y) then Drawing.mouse_pressed(line, x,y, button) end end end end function App.mousereleased(x,y, button) if Search_term then return end if Lines.current_drawing then Drawing.mouse_released(x,y, button) else for line_index,line in ipairs(Lines) do if line.mode == 'text' then if Text.in_line(line, x,y) then Cursor1.line = line_index Cursor1.pos = Text.to_pos_on_line(line, x, y) if Text.eq1(Cursor1, Selection1) and not App.shift_down() then Selection1 = {} end end end end --? print('select:', Selection1.line, Selection1.pos) end end function App.textinput(t) for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll if Search_term then Search_term = Search_term..t Search_text = nil Text.search_next() elseif Current_drawing_mode == 'name' then local drawing = Lines.current_drawing local p = drawing.points[drawing.pending.target_point] p.name = p.name..t else Text.textinput(t) end save_to_disk(Lines, Filename) end function App.keychord_pressed(chord) if Search_term then if chord == 'escape' then Search_term = nil Search_text = nil Cursor1 = Search_backup.cursor Screen_top1 = Search_backup.screen_top Search_backup = nil elseif chord == 'return' then Search_term = nil Search_text = nil Search_backup = nil elseif chord == 'backspace' then local len = utf8.len(Search_term) local byte_offset = utf8.offset(Search_term, len) Search_term = string.sub(Search_term, 1, byte_offset-1) Search_text = nil elseif chord == 'down' then Cursor1.pos = Cursor1.pos+1 Text.search_next() elseif chord == 'up' then Text.search_previous() end return elseif chord == 'C-f' then Search_term = '' Search_backup = {cursor={line=Cursor1.line, pos=Cursor1.pos}, screen_top={line=Screen_top1.line, pos=Screen_top1.pos}} assert(Search_text == nil) elseif chord == 'C-=' then initialize_font_settings(Font_height+2) Text.redraw_all() elseif chord == 'C--' then initialize_font_settings(Font_height-2) Text.redraw_all() elseif chord == 'C-0' then initialize_font_settings(20) Text.redraw_all() elseif chord == 'C-z' then for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll local event = undo_event() if event then local src = event.before Screen_top1 = deepcopy(src.screen_top) Cursor1 = deepcopy(src.cursor) Selection1 = deepcopy(src.selection) patch(Lines, event.after, event.before) end elseif chord == 'C-y' then for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll local event = redo_event() if event then local src = event.after Screen_top1 = deepcopy(src.screen_top) Cursor1 = deepcopy(src.cursor) Selection1 = deepcopy(src.selection) patch(Lines, event.before, event.after) end -- clipboard elseif chord == 'C-c' then for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll local s = Text.selection() if s then App.setClipboardText(s) end elseif chord == 'C-x' then for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll local s = Text.cut_selection() if s then App.setClipboardText(s) end save_to_disk(Lines, Filename) elseif chord == 'C-v' then for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll -- We don't have a good sense of when to scroll, so we'll be conservative -- and sometimes scroll when we didn't quite need to. local before_line = Cursor1.line local before = snapshot(before_line) local clipboard_data = App.getClipboardText() local num_newlines = 0 -- hack 1 for _,code in utf8.codes(clipboard_data) do local c = utf8.char(code) if c == '\n' then Text.insert_return() num_newlines = num_newlines+1 else Text.insert_at_cursor(c) end end -- hack 1: if we have too many newlines we definitely need to scroll for i=before_line,Cursor1.line do Lines[i].screen_line_starting_pos = nil Text.populate_screen_line_starting_pos(i) end if Cursor1.line-Screen_top1.line+1 + num_newlines > App.screen.height/Line_height then Text.snap_cursor_to_bottom_of_screen() end -- hack 2: if we have too much text wrapping we definitely need to scroll local clipboard_text = App.newText(love.graphics.getFont(), clipboard_data) local clipboard_width = App.width(clipboard_text) --? print(Cursor_y, Cursor_y*Line_width, Cursor_y*Line_width+Cursor_x, Cursor_y*Line_width+Cursor_x+clipboard_width, Line_width*App.screen.height/Line_height) if Cursor_y*Line_width+Cursor_x + clipboard_width > Line_width*App.screen.height/Line_height then Text.snap_cursor_to_bottom_of_screen() end save_to_disk(Lines, Filename) record_undo_event({before=before, after=snapshot(before_line, Cursor1.line)}) -- dispatch to drawing or text elseif love.mouse.isDown('1') or chord:sub(1,2) == 'C-' then -- DON'T reset line.y here Drawing.keychord_pressed(chord) elseif chord == 'escape' and love.mouse.isDown('1') then local drawing = Drawing.current_drawing() if drawing then drawing.pending = {} end elseif chord == 'escape' and not love.mouse.isDown('1') then for _,line in ipairs(Lines) do if line.mode == 'drawing' then line.show_help = false end end elseif Current_drawing_mode == 'name' then if chord == 'return' then Current_drawing_mode = Previous_drawing_mode Previous_drawing_mode = nil else local drawing = Lines.current_drawing local p = drawing.points[drawing.pending.target_point] if chord == 'escape' then p.name = nil elseif chord == 'backspace' then local len = utf8.len(p.name) local byte_offset = utf8.offset(p.name, len-1) p.name = string.sub(p.name, 1, byte_offset) end end save_to_disk(Lines, Filename) else for _,line in ipairs(Lines) do line.y = nil end -- just in case we scroll Text.keychord_pressed(chord) end end function App.keyreleased(key, scancode) end