about summary refs log tree commit diff stats
path: root/src/command
Commit message (Expand)AuthorAgeFilesLines
* Removed 'empty' from roster autocompleterJames Booth2015-07-141-1/+0
* Check for self jid on /softwareJames Booth2015-07-081-0/+4
* Changed /roster empty -> /roster remove_all contactsJames Booth2015-07-082-21/+36
* Allow hiding of empty presence groups: /roster {show,hide} empty (default is ...Daniel2015-07-082-0/+17
* Merge remote-tracking branch 'incertia/time'James Booth2015-07-012-39/+43
|\
| * add examples and be more specific about time formattingWill Song2015-05-301-3/+8
| * update autocompleteWill Song2015-05-291-11/+13
| * fix conflictsWill Song2015-05-294-1093/+1332
| |\
| * | use custom format string for time preferenceWill Song2015-01-272-36/+9
* | | Added messaage when account resource changed whilst connectedJames Booth2015-06-241-1/+5
* | | Fixed various jid and account mem leaksJames Booth2015-06-241-0/+2
* | | free account after account connectJames Booth2015-06-241-0/+1
* | | Added /pgp setkey commandJames Booth2015-06-232-9/+49
* | | Added PGP prefsJames Booth2015-06-222-0/+5
* | | Fixed pgp helpJames Booth2015-06-211-1/+1
* | | Fixed /pgp help formattingJames Booth2015-06-211-1/+1
* | | Added PGP logging preferencesJames Booth2015-06-212-9/+49
* | | Moved setting otr.warn -> enc.warnJames Booth2015-06-213-13/+16
* | | Added /pgp end commandJames Booth2015-06-212-0/+25
* | | Added enc_mode check when starting OTRJames Booth2015-06-211-0/+10
* | | Added pgp checks for message sendingJames Booth2015-06-211-2/+2
* | | Added window encyption mode for PGPJames Booth2015-06-202-45/+133
* | | Merge branch 'master' into openpgpJames Booth2015-06-202-0/+19
|\ \ \
| * | | Added /roster empty commandJames Booth2015-06-202-0/+19
* | | | Added initial /pgp start checksJames Booth2015-06-181-0/+7
* | | | Added cmd_pgp testsJames Booth2015-06-181-1/+4
* | | | Merge branch 'master' into openpgpJames Booth2015-06-171-1/+1
|\| | |
| * | | Merge remote-tracking branch 'quite/#513'James Booth2015-06-171-1/+1
| |\ \ \
| | * | | Let's only strip trailing whitespace when parsing commandDaniel2015-06-161-1/+1
* | | | | Merge branch 'master' into openpgpJames Booth2015-06-172-48/+96
|\| | | |
| * | | | Removed wins_get_current_* functionsJames Booth2015-06-172-48/+96
* | | | | Merge branch 'master' into openpgpJames Booth2015-06-174-371/+328
|\| | | |
| * | | | Removed unused function prototypeJames Booth2015-06-171-2/+0
| * | | | Added current window reference to command functionsJames Booth2015-06-173-268/+228
| * | | | Pass current window to autocompletersJames Booth2015-06-164-99/+98
| |/ / /
* | | | Merge branch 'master' into openpgpJames Booth2015-06-151-79/+118
|\| | |
| * | | Tidied cmd_otr, added check-unit target to MakefileJames Booth2015-06-151-79/+118
* | | | Merge branch 'master' into openpgpJames Booth2015-06-151-2/+2
|\| | |
| * | | Removed ui_get_current_chat()James Booth2015-06-151-2/+2
* | | | Merge branch 'master' into openpgpJames Booth2015-06-152-3/+4
|\| | |
| * | | Moved UI interfaces to ui.hJames Booth2015-06-151-1/+1
| * | | Moved ui/windows -> window_listJames Booth2015-06-152-2/+2
| * | | Added win_clear() functionJames Booth2015-06-151-1/+2
* | | | Merge branch 'master' into openpgpJames Booth2015-06-141-15/+54
|\| | |
| * | | Set columns when running functional testsJames Booth2015-06-131-15/+54
* | | | Show message when offline for /pgp fpsJames Booth2015-06-131-13/+18
* | | | Merge branch 'master' into openpgpJames Booth2015-06-023-3/+33
|\| | |
| * | | Merge remote-tracking branch 'PMaynard/#551'James Booth2015-06-023-3/+33
| |\ \ \ | | |_|/ | |/| |
| | * | Tidy up windows when enablingPete2015-06-011-0/+4
| | * | Extra underlinePete Maynard2015-06-011-1/+1
?id=8aa72be226e13b1af7ab09a7dc1eec4a95a82f82'>^
37f1313 ^
46d4c4d ^





1a6f533 ^
46d4c4d ^

1a6f533 ^
46d4c4d ^



1a6f533 ^
46d4c4d ^



1a6f533 ^
f49e2fd ^
26033f4 ^

46d4c4d ^





37f1313 ^
46d4c4d ^
9a41c7c ^






d1dd3e4 ^
9a41c7c ^









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
                                                      









                                               


                                                     
                                   





















                                                                                                                            

                                                      
                        
                                                      
     
                                      


                                  

                              




                 






                                                                             



                                                                 
                                                                                                                                 

                                          
                                                                                                                                 
                                          
                                                                                              
                                          
                           
                                                                                                                             
                                                     

                                                             
                                    
                                                                                                                                            
                                              

                                       


                       









                                          
                                             

                                                                                                           
                               
                                                                                              




                                                     
                               
                                      
                                                                                                                   
                                   
                                                                                                                                                                             

                                       


                       



                        




                             
                              


                              
                   
                                                                                                        



                                                           
        
                                 














                                                                             
                





                                                                 
                                                                                                                                 

                                          
                                                                                                                                 



                                                                                              
                                                                                                                             



                                                             
                                                                                                                                            
                                              

                                       





                                       
                   
   






                                                    
                                                                                                  









                                                                                                
-- primitives for saving to file and loading from file
function file_exists(filename)
  local infile = App.open_for_reading(filename)
  if infile then
    infile:close()
    return true
  else
    return false
  end
end

function load_from_disk(State)
  local infile = App.open_for_reading(State.filename)
  State.lines = load_from_file(infile)
  if infile then infile:close() end
end

function load_from_file(infile)
  local result = {}
  if infile then
    local infile_next_line = infile:lines()  -- works with both Lua files and LÖVE Files (https://www.love2d.org/wiki/File)
    while true do
      local line = infile_next_line()
      if line == nil then break end
      if line == '```lines' then  -- inflexible with whitespace since these files are always autogenerated
        table.insert(result, load_drawing(infile_next_line))
      else
        table.insert(result, {mode='text', data=line})
      end
    end
  end
  if #result == 0 then
    table.insert(result, {mode='text', data=''})
  end
  return result
end

function save_to_disk(State)
  local outfile = App.open_for_writing(State.filename)
  if outfile == nil then
    error('failed to write to "'..State.filename..'"')
  end
  for _,line in ipairs(State.lines) do
    if line.mode == 'drawing' then
      store_drawing(outfile, line)
    else
      outfile:write(line.data)
      outfile:write('\n')
    end
  end
  outfile:close()
end

function load_drawing(infile_next_line)
  local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}
  while true do
    local line = infile_next_line()
    assert(line)
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'freehand' then
      -- no changes needed
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local name = shape.p1.name
      shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p1].name = name
      name = shape.p2.name
      shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p2].name = name
    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
      for i,p in ipairs(shape.vertices) do
        local name = p.name
        shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)
        drawing.points[shape.vertices[i]].name = name
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      local name = shape.center.name
      shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.center].name = name
    elseif shape.mode == 'deleted' then
      -- ignore
    else
      print(shape.mode)
      assert(false)
    end
    table.insert(drawing.shapes, shape)
  end
  return drawing
end

function store_drawing(outfile, drawing)
  outfile:write('```lines\n')
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'freehand' then
      outfile:write(json.encode(shape), '\n')
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})
      outfile:write(line, '\n')
    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
      local obj = {mode=shape.mode, vertices={}}
      for _,p in ipairs(shape.vertices) do
        table.insert(obj.vertices, drawing.points[p])
      end
      local line = json.encode(obj)
      outfile:write(line, '\n')
    elseif shape.mode == 'circle' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\n')
    elseif shape.mode == 'arc' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\n')
    elseif shape.mode == 'deleted' then
      -- ignore
    else
      print(shape.mode)
      assert(false)
    end
  end
  outfile:write('```\n')
end

-- for tests
function load_array(a)
  local result = {}
  local next_line = ipairs(a)
  local i,line,drawing = 0, ''
  while true do
    i,line = next_line(a, i)
    if i == nil then break end
--?     print(line)
    if line == '```lines' then  -- inflexible with whitespace since these files are always autogenerated
--?       print('inserting drawing')
      i, drawing = load_drawing_from_array(next_line, a, i)
--?       print('i now', i)
      table.insert(result, drawing)
    else
--?       print('inserting text')
      table.insert(result, {mode='text', data=line})
    end
  end
  if #result == 0 then
    table.insert(result, {mode='text', data=''})
  end
  return result
end

function load_drawing_from_array(iter, a, i)
  local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}
  local line
  while true do
    i, line = iter(a, i)
    assert(i)
--?     print(i)
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'freehand' then
      -- no changes needed
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local name = shape.p1.name
      shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p1].name = name
      name = shape.p2.name
      shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.p2].name = name
    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
      for i,p in ipairs(shape.vertices) do
        local name = p.name
        shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)
        drawing.points[shape.vertices[i]].name = name
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      local name = shape.center.name
      shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)
      drawing.points[shape.center].name = name
    elseif shape.mode == 'deleted' then
      -- ignore
    else
      print(shape.mode)
      assert(false)
    end
    table.insert(drawing.shapes, shape)
  end
  return i, drawing
end

function is_absolute_path(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return path:sub(1,1) == '/'
  elseif os_path_separator == '\\' then
    if path:sub(2,2) == ':' then return true end  -- DOS drive letter followed by volume separator
    local f = path:sub(1,1)
    return f == '/' or f == '\\'
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end
end

function is_relative_path(path)
  return not is_absolute_path(path)
end