aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/e_keys.go45
-rw-r--r--src/i_ui.go82
2 files changed, 42 insertions, 85 deletions
diff --git a/src/e_keys.go b/src/e_keys.go
index 859a925..0158450 100644
--- a/src/e_keys.go
+++ b/src/e_keys.go
@@ -173,18 +173,18 @@ func e_normal_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.insert_sel = 0
ui.insert_sel_ok = false
ui.insert_scroll = 0
- tmp := ItemsNode{}
+ // tmp := ItemsNode{}
data.insert = &HostNode{}
- tmp.Host = data.insert
- if data.litems.curr == nil {
- tmp.Host.parent = data.ldirs.head
- } else if data.litems.curr.is_dir() == true {
- data.insert.parent = data.litems.curr.Dirs
- } else {
- data.insert.parent = data.litems.curr.Host.parent
- }
- e_set_protocol_defaults(data, data.insert)
- data.litems.add_after(&tmp)
+ // tmp.Host = data.insert
+ // if data.litems.curr == nil {
+ // tmp.Host.parent = data.ldirs.head
+ // } else if data.litems.curr.is_dir() == true {
+ // data.insert.parent = data.litems.curr.Dirs
+ // } else {
+ // data.insert.parent = data.litems.curr.Host.parent
+ // }
+ // e_set_protocol_defaults(data, data.insert)
+ // data.litems.add_after(&tmp)
} else if event.Rune() == 'e' &&
data.litems.curr != nil &&
data.litems.curr.is_dir() == false {
@@ -366,13 +366,6 @@ func e_insert_name_events(data *HardData, ui *HardUI,
ui.insert_sel = 0
data.insert = nil
ui.buff.empty()
- tmp := data.litems.curr.prev
- data.litems.del(data.litems.curr)
- if tmp == nil {
- tmp = data.litems.head
- }
- data.litems.curr = tmp
- data.litems.reset_id()
} else if event.Key() == tcell.KeyEnter {
if ui.buff.len() == 0 {
ui.s.HideCursor()
@@ -381,20 +374,16 @@ func e_insert_name_events(data *HardData, ui *HardUI,
ui.insert_sel_ok = false
data.insert = nil
ui.buff.empty()
- tmp := data.litems.curr.prev
- data.litems.del(data.litems.curr)
- if tmp == nil {
- tmp = data.litems.head
- }
- data.litems.curr = tmp
return true
}
+ data.insert.Name = ui.buff.str()
+ data.insert.parent = data.litems.curr.Host.parent
+ e_set_protocol_defaults(data, data.insert)
ui.s.HideCursor()
ui.mode = INSERT_MODE
ui.buff.empty()
} else {
e_readline(event, &ui.buff, ui, data.home_dir)
- data.litems.curr.Host.Name = ui.buff.str()
}
return false
}
@@ -417,12 +406,6 @@ func e_insert_events(data *HardData, ui *HardUI, event tcell.EventKey) bool {
ui.s.HideCursor()
ui.mode = NORMAL_MODE
ui.insert_sel = 0
- tmp := data.litems.curr.prev
- data.litems.del(data.litems.curr)
- if tmp == nil {
- tmp = data.litems.head
- }
- data.litems.curr = tmp
data.insert = nil
ui.buff.empty()
} else if event.Rune() == 'j' ||
diff --git a/src/i_ui.go b/src/i_ui.go
index fd65c32..486cc29 100644
--- a/src/i_ui.go
+++ b/src/i_ui.go
@@ -239,9 +239,7 @@ func i_draw_bottom_text(ui HardUI, insert *HostNode, insert_err []error) {
text = ui.msg_buff
} else {
switch ui.mode {
- case NORMAL_MODE,
- INSERT_NAME_MODE,
- RENAME_MODE:
+ case NORMAL_MODE:
text = NORMAL_KEYS_HINTS
case DELETE_MODE:
text = CONFIRM_KEYS_HINTS
@@ -513,54 +511,32 @@ func i_prompt_dir(ui HardUI, prompt string, home_dir string) {
ui.s.ShowCursor(len(prompt) + 1 + ui.buff.cursor, ui.dim[H] - 1)
}
-func i_prompt_insert(ui HardUI, litems *ItemsList, icons bool, curr *ItemsNode) {
- // path := "/"
- // if curr != nil {
- // if ui.mode == RENAME_MODE {
- // if curr.is_dir() == false {
- // path = curr.path()
- // } else {
- // path = curr.Dirs.Parent.path()
- // }
- // } else {
- // path = curr.path()
- // }
- // }
- // path = path[1:]
- // prompt := "Name: "
- // i_draw_text(ui.s,
- // 1, ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
- // ui.style[DEF_STYLE], prompt)
- // i_draw_text(ui.s, len(prompt) + 1,
- // ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
- // ui.style[DEF_STYLE], path)
- // i_draw_text(ui.s, len(prompt) + 1 + len(path),
- // ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
- // ui.style[DEF_STYLE].Bold(true), ui.buff.str())
- // ui.s.ShowCursor(len(prompt) + 1 + len(path) +
- // ui.buff.cursor, ui.dim[H] - 1)
- // FIX: fix this shit
-
- logger.Println("draw: ", litems.draw.ID)
- logger.Println("curr: ", litems.curr.ID)
- spaces := 1
- depth := 0
- ptr := litems.curr;
- if ptr.is_dir() == false && ptr.Host != nil {
- depth = int(ptr.Host.parent.Depth)
- for i := 0; i < depth + 1 - 2; i++ {
- spaces += 2
- }
- } else if ptr.Dirs != nil {
- depth = int(ptr.Dirs.Depth)
- for i := 0; i < int(depth) - 2; i++ {
- spaces += 2
+func i_prompt_insert(ui HardUI, curr *ItemsNode) {
+ path := "/"
+ if curr != nil {
+ if ui.mode == RENAME_MODE {
+ if curr.is_dir() == false {
+ path = curr.path()
+ } else {
+ path = curr.Dirs.Parent.path()
+ }
+ } else {
+ path = curr.path()
}
}
- if icons == true {
- spaces += 2
- }
- ui.s.ShowCursor(1 + spaces + ui.buff.cursor, 1 + litems.curr.ID - litems.draw.ID)
+ path = path[1:]
+ prompt := "Name: "
+ i_draw_text(ui.s,
+ 1, ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
+ ui.style[DEF_STYLE], prompt)
+ i_draw_text(ui.s, len(prompt) + 1,
+ ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
+ ui.style[DEF_STYLE], path)
+ i_draw_text(ui.s, len(prompt) + 1 + len(path),
+ ui.dim[H] - 1, ui.dim[W] - 1, ui.dim[H] - 1,
+ ui.style[DEF_STYLE].Bold(true), ui.buff.str())
+ ui.s.ShowCursor(len(prompt) + 1 + len(path) +
+ ui.buff.cursor, ui.dim[H] - 1)
}
func i_prompt_fuzz(ui HardUI) {
@@ -916,16 +892,14 @@ func i_ui(data_dir string) {
case MKDIR_MODE:
i_prompt_mkdir(data.ui, data.litems.curr)
case INSERT_NAME_MODE:
- i_prompt_insert(data.ui, data.litems,
- data.opts.Icon, data.litems.curr)
+ i_prompt_insert(data.ui, data.litems.curr)
case INSERT_MODE:
- // i_draw_insert_panel(&data.ui, data.insert, data.home_dir)
+ i_draw_insert_panel(&data.ui, data.insert, data.home_dir)
if data.insert_err != nil {
i_draw_insert_err_msg(data.ui, data.insert_err)
}
case RENAME_MODE:
- i_prompt_insert(data.ui, data.litems,
- data.opts.Icon, data.litems.curr)
+ i_prompt_insert(data.ui, data.litems.curr)
case HELP_MODE:
i_draw_help(&data.ui)
case FUZZ_MODE:
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js