awesomewm-mirrors
/
radical
mirror of https://github.com/Elv13/radical.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve dynamic menu speed

This commit is contained in:
Emmanuel Lepage Vallee 2014-03-26 16:18:59 -04:00
parent 700714eb1e
commit ef7e46f865
7 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
context.lua
View File

@ -14,6 +14,7 @@ local layout = require( "radical.layout" )
local checkbox = require( "radical.widgets.checkbox" )
local arrow_style = require( "radical.style.arrow" )
local item_mod = require("radical.item")
local glib = require("lgi").GLib
local capi,module = { mouse = mouse , screen = screen, keygrabber = keygrabber },{}
@ -36,9 +37,35 @@ local function get_direction(data)
end
end
local function set_geometry_real(data)
local geo = data._internal._next_geometry
if geo then
for k,v in pairs(geo) do
data.wibox[k] = v
end
end
data._internal._next_geometry = nil
data._internal._need_geometry_reload = nil
end
-- This will update the position before the next loop cycle
-- This avoid tons of round trips with X for dynamic menus
local function change_geometry_idle(data, x, y, w, h)
data._internal._next_geometry = data._internal._next_geometry or {}
local geo = data._internal._next_geometry
geo.x = x or geo.x
geo.y = y or geo.y
geo.width = w or geo.width
geo.height = h or geo.height
if not data._internal._need_geometry_reload then
glib.idle_add(glib.PRIORITY_HIGH_IDLE, function() set_geometry_real(data) end)
data._internal._need_geometry_reload = true
end
end
local function set_position(self)
if not self.visible then return end
local ret,parent = {x=self.wibox.x,y=self.wibox.y},self.parent_geometry
local ret,parent = {x=self.x,y=self.y},self.parent_geometry
local prefx,prefy = self._internal.private_data.x,self._internal.private_data.y
local src_geo = capi.screen[capi.mouse.screen].geometry
if parent and parent.is_menu then
@ -60,9 +87,9 @@ local function set_position(self)
elseif parent then
local drawable_geom = parent.drawable.drawable.geometry(parent.drawable.drawable)
if (self.direction == "left") or (self.direction == "right") then
ret = {x=drawable_geom.x+((self.direction == "right") and - self.wibox.width or drawable_geom.width),y=drawable_geom.y+parent.y+((self.arrow_type ~= base.arrow_type.NONE) and parent.height/2-(self.arrow_x or 20)-6 or 0)}
ret = {x=drawable_geom.x+((self.direction == "right") and - self.width or drawable_geom.width),y=drawable_geom.y+parent.y+((self.arrow_type ~= base.arrow_type.NONE) and parent.height/2-(self.arrow_x or 20)-6 or 0)}
else
ret = {x=drawable_geom.x+parent.x-((self.arrow_type ~= base.arrow_type.NONE) and (self._arrow_x or 20)+11-parent.width/2 or 0),y=(self.direction == "bottom") and drawable_geom.y-self.wibox.height or drawable_geom.y+drawable_geom.height}
ret = {x=drawable_geom.x+parent.x-((self.arrow_type ~= base.arrow_type.NONE) and (self._arrow_x or 20)+11-parent.width/2 or 0),y=(self.direction == "bottom") and drawable_geom.y-self.height or drawable_geom.y+drawable_geom.height}
end
elseif prefx ~= 0 or prefy ~= 0 then
ret = capi.mouse.coords()
@ -94,8 +121,7 @@ local function set_position(self)
elseif ret.x < 0 then
ret.x = 0
end
self.wibox.x = ret.x
self.wibox.y = ret.y - 2*(self.wibox.border_width or 0)
change_geometry_idle(self,ret.x,ret.y - 2*(self.wibox.border_width or 0))
end
local function setup_drawable(data)
@ -118,10 +144,10 @@ local function setup_drawable(data)
--Getters
data.get_wibox = function() return internal.w end
data.get_x = function() return internal.w.x end
data.get_y = function() return internal.w.y end
data.get_width = function() return internal.w.width end
data.get_height = function() return internal.w.height end
data.get_x = function() return data._internal._next_geometry and data._internal._next_geometry.x or internal.w.x end
data.get_y = function() return data._internal._next_geometry and data._internal._next_geometry.y or internal.w.y end
data.get_width = function() return data._internal._next_geometry and data._internal._next_geometry.width or internal.w.width end
data.get_height = function() return data._internal._next_geometry and data._internal._next_geometry.height or internal.w.height end
data.get_visible = function() return private_data.visible end
data.get_direction = function() return private_data.direction end
data.get_margins = function()
@ -141,12 +167,12 @@ local function setup_drawable(data)
data.width = fit_w
end
end
data.set_x = function(_,value) internal.w.x = value end
data.set_y = function(_,value) internal.w.y = value end
data.set_x = function(_,value) change_geometry_idle(data,value) end
data.set_y = function(_,value) change_geometry_idle(data,nil,value) end
data.set_width = function(_,value)
local need_update = internal.w.width == (value + 2*data.border_width)
local margins = data.margins
internal.w.width = value + data.margins.left + data.margins.right
change_geometry_idle(data,nil,nil,value + data.margins.left + data.margins.right)
if need_update then
data.style(data)
end
@ -155,7 +181,7 @@ local function setup_drawable(data)
local margins = data.margins
local need_update = (internal.w.height ~= (value + margins.top + margins.bottom))
local new_height = (value + margins.top + margins.bottom) or 1
internal.w.height = new_height > 0 and new_height or 1
change_geometry_idle(data,nil,nil,nil,new_height > 0 and new_height or 1)
if need_update then
data.style(data)
internal.set_position(data)

5
impl/taglist/init.lua
View File

@ -222,9 +222,8 @@ capi.tag.connect_signal("property::index2",function(t,i)
local s = tag.getscreen(t)
local item = cache[t]
if item then
local index = tag.getidx(t)
instances[s]:move(item,index)
item.tw:set_markup(" <b>"..(index).."</b> ")
instances[s]:move(item,i)
item.tw:set_markup(" <b>"..(i).."</b> ")
end
end
end)

2
impl/taglist/tag_menu.lua
View File

@ -65,7 +65,7 @@ local function new(t)
if (file == "END" or nil) or (counter > 30) then
break
end
mainMenu2:add_item({ button1 = function() tag.seticon(file,aTag) end, icon = file})
mainMenu2:add_item({ button1 = function() tag.seticon(file,aTag) end, icon = file, item_layout = radical.item.layout.icon})
counter = counter +1
end
f:close()

3
impl/taglist/tracker.lua
View File

@ -19,6 +19,7 @@ local function reload(t,s)
local new_tags = tag.gettags(s)
for k,v in ipairs(new_tags) do
if v ~= old_tags[k] then
print(v.name,k,s,tag.getscreen(v),tag.getidx(v))
v:emit_signal("property::index2",k)
screen_cache[v] = s
end
@ -59,4 +60,4 @@ capi.tag.add_signal("property::index2")
return setmetatable({}, { __call = function(_, ...) return new(...) end })
-- kate: space-indent on; indent-width 2; replace-tabs on;
-- kate: space-indent on; indent-width 2; replace-tabs on;

4
impl/tasklist/init.lua
View File

@ -202,7 +202,9 @@ end
-- Remove the client from the tag
local function untagged(c,t)
local item = _cache[c]
local menu = instances[tag.getscreen(t)].menu
local screen = tag.getscreen(t)
if not item or not instances[screen] then return end
local menu = instances[screen].menu
if t.selected then
menu:remove(item)
end

13
layout/vertical.lua
View File

@ -148,11 +148,13 @@ function module:setup_item(data,item,args)
end)
item._private_data._fit = wibox.widget.background.fit
item._internal.margin_w.fit = function(...)
if (item.visible == false or item._filter_out == true or item._hidden == true) then
return 0,0
if item._internal.margin_w then
item._internal.margin_w.fit = function(...)
if (item.visible == false or item._filter_out == true or item._hidden == true) then
return 0,0
end
return data._internal.layout.item_fit(data,item,...)
end
return data._internal.layout.item_fit(data,item,...)
end
-- Text need to take as much space as possible, override default
@ -160,6 +162,7 @@ function module:setup_item(data,item,args)
-- Necessary for :set_position()
local fit_w,fit_h = data._internal.layout:fit()
data.width = fit_w
data.height = fit_h
@ -178,7 +181,7 @@ function module:setup_item(data,item,args)
item_style(item,{})
-- Compute the minimum width
if data.auto_resize then
if data.auto_resize and item._internal.margin_w then
local fit_w,fit_h = wibox.layout.margin.fit(item._internal.margin_w,9999,9999)
local is_largest = item == data._internal.largest_item_w
if fit_w < 1000 and (not data._internal.largest_item_w_v or data._internal.largest_item_w_v < fit_w) then

8
style/arrow.lua
View File

@ -53,7 +53,7 @@ local function do_gen_menu_top(data, width, height, radius,padding,args)
end
local function _set_direction(data,direction)
local geometry = (direction == "left" or direction == "right") and {width = data.wibox.height, height = data.wibox.width} or {height = data.wibox.height, width = data.wibox.width}
local geometry = (direction == "left" or direction == "right") and {width = data.height, height = data.width} or {height = data.height, width = data.width}
local top_clip_surface = do_gen_menu_top(data,geometry.width,geometry.height,10,data.border_width,{bg=beautiful.fg_normal or "#0000ff",fg=data.bg or "#00ffff"})
local top_bounding_surface = do_gen_menu_top(data,geometry.width,geometry.height,10,0,{bg="#00000000",fg="#ffffffff"})
@ -91,16 +91,16 @@ local function draw(data,args)
local at = data.arrow_type
if at == base.arrow_type.PRETTY or not at then
if direction == "left" then
data._arrow_x = data.wibox.height -20 - (data.arrow_x or 20)
data._arrow_x = data.height -20 - (data.arrow_x or 20)
elseif direction == "right" then
--TODO
elseif direction == "bottom" then
data._arrow_x = data.wibox.width -20 - (data.arrow_x or 20)
data._arrow_x = data.width -20 - (data.arrow_x or 20)
elseif direction == "top" then
--TODO
end
elseif at == base.arrow_type.CENTERED then
data._arrow_x = data.wibox.width/2 - 13
data._arrow_x = data.width/2 - 13
end
--END set_arrow