Skip to content

Commit

Permalink
added configuration support
Browse files Browse the repository at this point in the history
Now you can add a custom interpreter to moonterm
  • Loading branch information
sodomon2 committed Jan 17, 2021
1 parent eba4493 commit 0521b97
Show file tree
Hide file tree
Showing 5 changed files with 212 additions and 14 deletions.
80 changes: 80 additions & 0 deletions libraries/LIP.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
--[[
Copyright (c) 2012 Carreras Nicolas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--]]
--- Lua INI Parser.
-- It has never been that simple to use INI files with Lua.
--@author Dynodzzo

local LIP = {};

--- Returns a table containing all the data from the INI file.
--@param fileName The name of the INI file to parse. [string]
--@return The table containing all data from the INI file. [table]
function LIP:load(fileName)
assert(type(fileName) == 'string', 'Parameter "fileName" must be a string.');
local file = assert(io.open(fileName, 'r'), 'Error loading file : ' .. fileName);
local data = {};
local section;
for line in file:lines() do
local tempSection = line:match('^%[([^%[%]]+)%]$');
if(tempSection)then
section = tonumber(tempSection) and tonumber(tempSection) or tempSection;
data[section] = data[section] or {};
end
local param, value = line:match('^([%w|_]+)%s-=%s-(.+)$');
if(param and value ~= nil)then
if(tonumber(value))then
value = tonumber(value);
elseif(value == 'true')then
value = true;
elseif(value == 'false')then
value = false;
end
if(tonumber(param))then
param = tonumber(param);
end
data[section][param] = value;
end
end
file:close();
return data;
end

--- Saves all the data from a table to an INI file.
--@param fileName The name of the INI file to fill. [string]
--@param data The table containing all the data to store. [table]
function LIP:save(fileName, data)
assert(type(fileName) == 'string', 'Parameter "fileName" must be a string.');
assert(type(data) == 'table', 'Parameter "data" must be a table.');
local file = assert(io.open(fileName, 'w+b'), 'Error loading file :' .. fileName);
local contents = '';
for section, param in pairs(data) do
contents = contents .. ('[%s]\n'):format(section);
for key, value in pairs(param) do
contents = contents .. ('%s =%s\n'):format(key, tostring(value));
end
contents = contents .. '\n';
end
file:write(contents);
file:close();
end

return LIP;
40 changes: 40 additions & 0 deletions libraries/utils.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--[[--
@package SODplayer
@filename utils.lua
@version 1.5
@author Diaz Urbaneja Victor Diego Alejandro <sodomon2@gmail.com>
@date 01.08.2020 19:22:11 -04
--]]

local utils = {}

function utils:create_config(dir,file)
local config_dir = ('%s/%s'):format(GLib.get_user_config_dir(), dir)
if not utils:isfile(('%s/moonterm.ini'):format(config_dir)) then
os.execute( ('mkdir -p %s'):format(config_dir) )
os.execute( ('cp %s %s'):format(file,config_dir) )
end
end

function utils:split(str,sep)
local sep, fields = sep or ":", {}
local pattern = string.format("([^%s]+)", sep)
str:gsub(pattern, function(c) fields[#fields+1] = c end)
return fields
end

function utils:isfile(file)
return (io.open(tostring(file), "r") ~= nil)
end

function utils:path_name(uri)
local uri = uri or ''
local _turi = utils:split(uri,'/')
local _name = _turi[#_turi]
local _path = '/' .. table.concat(_turi, '/')
table.remove(_turi,(#_turi))
result = { name = _name, path = _path }
return result
end

return utils
52 changes: 52 additions & 0 deletions moonterm-dialog.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
--[[--
@package MoonTerm
@filename moonterm-dialog.lua
@version 1.0
@author Diaz Urbaneja Victor Diego Alejandro <sodomon2@gmail.com>
@date 17.01.2021 00:52:45 -04
--]]

dialog_config = Gtk.Dialog {
title = "Preferences",
resizable = false
}

content = Gtk.Box {
orientation = 'HORIZONTAL',
spacing = 5,
border_width = 5,
Gtk.Label {
label = " Interpreter : ",
use_markup = true,
},
Gtk.Entry {
id = 'entry_interpreter'
}
}

button_box = Gtk.Box {
orientation = 'HORIZONTAL',
homogeneous = true,
spacing = 5,
border_width = 5,
Gtk.Button {
id = 'btn_apply',
label = "Apply",
on_clicked = function ()
conf.interpreter.executable = content.child.entry_interpreter.text
inifile:save(('%s/moonterm.ini'):format(dir), conf)
dialog_config:hide()
end
},
Gtk.Button {
id = 'btn_cancel',
label = "Cancel",
on_clicked = function ()
dialog_config:hide()
end
},
}

dialog_config:get_content_area():add(content)
dialog_config:get_content_area():add(button_box)
content.child.entry_interpreter:grab_focus()
3 changes: 3 additions & 0 deletions moonterm.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[interpreter]
executable =/bin/bash

51 changes: 37 additions & 14 deletions moonterm.lua
Original file line number Diff line number Diff line change
@@ -1,44 +1,67 @@
#!/usr/bin/env lua

local lgi = require("lgi")
local Gtk = lgi.require('Gtk', '3.0')
local Vte = lgi.Vte
local GLib = lgi.GLib
--[[--
@package MoonTerm
@filename moonterm.lua
@version 1.0
@author Diaz Urbaneja Victor Diego Alejandro <sodomon2@gmail.com>
@date 16.01.2021 23:52:45 -04
--]]

local app = Gtk.Application()
local term = Vte.Terminal()
inifile = require("libraries.LIP")
utils = require("libraries.utils")

local scroll = Gtk.ScrolledWindow()
local main_window = Gtk.Window {
lgi = require("lgi")
Gtk = lgi.require('Gtk', '3.0')
Vte = lgi.Vte
GLib = lgi.GLib

app = Gtk.Application()
term = Vte.Terminal()

utils:create_config('moonterm','moonterm.ini')
dir = ('%s/moonterm'):format(GLib.get_user_config_dir())
conf = inifile:load(('%s/moonterm.ini'):format(dir))

-- MoonTerm
require('moonterm-dialog')

scroll = Gtk.ScrolledWindow()
main_window = Gtk.Window {
width_request = 600,
height_request = 400,
scroll
}

local headerbar = Gtk.HeaderBar {
title = 'MoonTerm',
headerbar = Gtk.HeaderBar {
title = 'MoonTerm',
subtitle = 'a simple vte terminal in lua',
show_close_button = true
show_close_button = true,
Gtk.Button {
visible = true,
on_clicked = function () dialog_config:show_all() end,
Gtk.Image({icon_name = "gtk-justify-fill"})
}
}

function term:on_child_exited()
app:quit()
end

function app:on_activate()
local font = term:get_font()
font = term:get_font()
--font:set_family("Camingo Code") -- Fix error when " Camingo Code " font is not available
font:set_size(font:get_size() * 1.2)

term:spawn_sync(
Vte.PtyFlags.DEFAULT,
nil,
{ os.getenv("SHELL") },
{ conf.interpreter.executable },
nil,
GLib.SpawnFlags.DEFAULT,
function() end
)
dialog_config.child.entry_interpreter.text = conf.interpreter.executable
main_window:set_titlebar(headerbar)
scroll:add(term)
main_window.set_icon_name(main_window,'terminal')
Expand Down

0 comments on commit 0521b97

Please sign in to comment.