Merge branch 'master' into dev

data/core/init.lua

@@ -982,26 +982,18 @@ end
 function core.step()
   -- handle events
   local did_keymap = false
-  local mouse_moved = false
-  local mouse = { x = 0, y = 0, dx = 0, dy = 0 }
-
 
   for type, a,b,c,d in system.poll_event do
-    if type == "mousemoved" then
-      mouse_moved = true
-      mouse.x, mouse.y = a, b
-      mouse.dx, mouse.dy = mouse.dx + c, mouse.dy + d
-    elseif type == "textinput" and did_keymap then
+    if type == "textinput" and did_keymap then
       did_keymap = false
+    elseif type == "mousemoved" then
+      core.try(core.on_event, type, a, b, c, d)
     else
       local _, res = core.try(core.on_event, type, a, b, c, d)
       did_keymap = res or did_keymap
     end
     core.redraw = true
   end
-  if mouse_moved then
-    core.try(core.on_event, "mousemoved", mouse.x, mouse.y, mouse.dx, mouse.dy)
-  end
 
   local width, height = renderer.get_size()
 

data/core/rootview.lua

@@ -129,36 +129,41 @@ function Node:split(dir, view, locked, resizable)
   return self.b
 end
 
-
-function Node:close_view(root, view)
-  local new_active_view = view == self.active_view
-  local do_close = function()
-    if #self.views > 1 then
-      local idx = self:get_view_idx(view)
-      table.remove(self.views, idx)
-      if new_active_view then
-        self:set_active_view(self.views[idx] or self.views[#self.views])
-      end
+function Node:remove_view(root, view)
+  if #self.views > 1 then
+    local idx = self:get_view_idx(view)
+    if idx < self.tab_offset then
+      self.tab_offset = self.tab_offset - 1
+    end
+    table.remove(self.views, idx)
+    if self.active_view == view then
+      self:set_active_view(self.views[idx] or self.views[#self.views])
+    end
+  else
+    local parent = self:get_parent_node(root)
+    local is_a = (parent.a == self)
+    local other = parent[is_a and "b" or "a"]
+    if other:get_locked_size() then
+      self.views = {}
+      self:add_view(EmptyView())
     else
-      local parent = self:get_parent_node(root)
-      local is_a = (parent.a == self)
-      local other = parent[is_a and "b" or "a"]
-      if other:get_locked_size() then
-        self.views = {}
-        self:add_view(EmptyView())
-      else
-        parent:consume(other)
-        local p = parent
-        while p.type ~= "leaf" do
-          p = p[is_a and "a" or "b"]
-        end
-        p:set_active_view(p.active_view)
-        if self.is_primary_node then
-          p.is_primary_node = true
-        end
+      parent:consume(other)
+      local p = parent
+      while p.type ~= "leaf" do
+        p = p[is_a and "a" or "b"]
+      end
+      p:set_active_view(p.active_view)
+      if self.is_primary_node then
+        p.is_primary_node = true
       end
     end
-    core.last_active_view = nil
+  end
+  core.last_active_view = nil
+end
+
+function Node:close_view(root, view)
+  local do_close = function()
+    self:remove_view(root, view)
   end
   view:try_close(do_close)
 end
@@ -169,13 +174,13 @@ function Node:close_active_view(root)
 end
 
 
-function Node:add_view(view)
+function Node:add_view(view, idx)
   assert(self.type == "leaf", "Tried to add view to non-leaf node")
   assert(not self.locked, "Tried to add view to locked node")
   if self.views[1] and self.views[1]:is(EmptyView) then
     table.remove(self.views)
   end
-  table.insert(self.views, view)
+  table.insert(self.views, idx or (#self.views + 1), view)
   self:set_active_view(view)
 end
 
@@ -749,7 +754,7 @@ function RootView:on_mouse_pressed(button, x, y, clicks)
     if button == "middle" or node.hovered_close == idx then
       node:close_view(self.root_node, node.views[idx])
     else
-      self.dragged_node = idx
+      self.dragged_node = { node, idx }
       node:set_active_view(node.views[idx])
     end
   else
@@ -816,15 +821,27 @@ function RootView:on_mouse_moved(x, y, dx, dy)
     end
   elseif tab_index then
     core.request_cursor("arrow")
-    if self.dragged_node and self.dragged_node ~= tab_index then
-      local tab = node.views[self.dragged_node]
-      table.remove(node.views, self.dragged_node)
-      table.insert(node.views, tab_index, tab)
-      self.dragged_node = tab_index
-    end
-  else
+  elseif node then
     core.request_cursor(node.active_view.cursor)
   end
+  if node and self.dragged_node and (self.dragged_node[1] ~= node or (tab_index and self.dragged_node[2] ~= tab_index))
+    and node.type == "leaf" and #node.views > 0 and node.views[1]:is(DocView) then 
+      local tab = self.dragged_node[1].views[self.dragged_node[2]]
+      if self.dragged_node[1] ~= node then
+        for i, v in ipairs(node.views) do if v.doc == tab.doc then tab = nil break end end
+        if tab then
+          self.dragged_node[1]:remove_view(self.root_node, tab)
+          node:add_view(tab, tab_index)
+          self.root_node:update_layout()
+          self.dragged_node = { node, tab_index or #node.views }
+          core.redraw = true
+        end
+      else
+        table.remove(self.dragged_node[1].views, self.dragged_node[2])
+        table.insert(node.views, tab_index, tab)
+        self.dragged_node = { node, tab_index }
+      end
+  end
 end
 
 

meson.build

@@ -33,7 +33,7 @@ if get_option('portable')
     lite_docdir = 'doc'
     lite_datadir = 'data'
 else
-    lite_docdir = 'share/doc'
+    lite_docdir = 'share/doc/lite-xl'
     lite_datadir = 'share/lite-xl'
 endif
 

src/api/system.c

@@ -201,6 +201,14 @@ top:
       return 4;
 
     case SDL_MOUSEMOTION:
+      SDL_PumpEvents();
+      SDL_Event event_plus;
+      while (SDL_PeepEvents(&event_plus, 1, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEMOTION) > 0) {
+        e.motion.x = event_plus.motion.x;
+        e.motion.y = event_plus.motion.y;
+        e.motion.xrel += event_plus.motion.xrel;
+        e.motion.yrel += event_plus.motion.yrel;
+      }
       lua_pushstring(L, "mousemoved");
       lua_pushnumber(L, e.motion.x);
       lua_pushnumber(L, e.motion.y);
@@ -530,11 +538,11 @@ static int f_fuzzy_match(lua_State *L) {
   bool files = false;
   if (lua_gettop(L) > 2 && lua_isboolean(L,3))
     files = lua_toboolean(L, 3);
-    
+
   int score = 0;
   int run = 0;
-  
-  // Match things *backwards*. This allows for better matching on filenames than the above 
+
+  // Match things *backwards*. This allows for better matching on filenames than the above
   // function. For example, in the lite project, opening "renderer" has lib/font_render/build.sh
   // as the first result, rather than src/renderer.c. Clearly that's wrong.
   if (files) {

src/renderer.c

@@ -309,7 +309,8 @@ void ren_draw_rect(RenRect rect, RenColor color) {
   int dr = surface->w - (x2 - x1);
 
   if (color.a == 0xff) {
-    rect_draw_loop(color);
+    SDL_Rect rect = { x1, y1, x2 - x1, y2 - y1 };
+    SDL_FillRect(surface, &rect, SDL_MapRGBA(surface->format, color.r, color.g, color.b, color.a));
   } else {
     rect_draw_loop(blend_pixel(*d, color));
   }