meta: replace bluelib with fx
This commit is contained in:
@@ -30,22 +30,22 @@ int compare_coords(size_t ax, size_t ay, size_t bx, size_t by)
|
||||
|
||||
struct hl_range *get_hl_range(struct line_ed *ed, size_t x, size_t y)
|
||||
{
|
||||
if (b_queue_empty(&ed->l_hl_ranges)) {
|
||||
if (fx_queue_empty(&ed->l_hl_ranges)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct hl_range *best_match = NULL;
|
||||
|
||||
b_queue_entry *entry = b_queue_first(&ed->l_hl_ranges);
|
||||
fx_queue_entry *entry = fx_queue_first(&ed->l_hl_ranges);
|
||||
while (entry) {
|
||||
struct hl_range *cur = b_unbox(struct hl_range, entry, h_entry);
|
||||
struct hl_range *cur = fx_unbox(struct hl_range, entry, h_entry);
|
||||
int cmp_end = compare_coords(x, y, cur->h_end_x, cur->h_end_y);
|
||||
|
||||
if (cmp_end != 1) {
|
||||
return cur;
|
||||
}
|
||||
|
||||
entry = b_queue_next(entry);
|
||||
entry = fx_queue_next(entry);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@@ -53,20 +53,20 @@ struct hl_range *get_hl_range(struct line_ed *ed, size_t x, size_t y)
|
||||
|
||||
struct hl_range *get_next_hl_range(struct hl_range *range)
|
||||
{
|
||||
b_queue_entry *entry = &range->h_entry;
|
||||
entry = b_queue_next(entry);
|
||||
fx_queue_entry *entry = &range->h_entry;
|
||||
entry = fx_queue_next(entry);
|
||||
if (!entry) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
range = b_unbox(struct hl_range, entry, h_entry);
|
||||
range = fx_unbox(struct hl_range, entry, h_entry);
|
||||
return range;
|
||||
}
|
||||
|
||||
int apply_hl_range(struct hl_range *range, b_tty *tty, size_t x, size_t y)
|
||||
int apply_hl_range(struct hl_range *range, fx_tty *tty, size_t x, size_t y)
|
||||
{
|
||||
if (!range) {
|
||||
b_tty_reset_vmode(tty);
|
||||
fx_tty_reset_vmode(tty);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -74,11 +74,11 @@ int apply_hl_range(struct hl_range *range, b_tty *tty, size_t x, size_t y)
|
||||
int cmp_end = compare_coords(x, y, range->h_end_x, range->h_end_y);
|
||||
|
||||
if (cmp_start < 0) {
|
||||
b_tty_reset_vmode(tty);
|
||||
fx_tty_reset_vmode(tty);
|
||||
}
|
||||
|
||||
if (cmp_start >= 0 && cmp_end <= 0) {
|
||||
b_tty_set_vmode(tty, &range->h_vmode);
|
||||
fx_tty_set_vmode(tty, &range->h_vmode);
|
||||
}
|
||||
|
||||
if (cmp_end == 1) {
|
||||
@@ -90,7 +90,7 @@ int apply_hl_range(struct hl_range *range, b_tty *tty, size_t x, size_t y)
|
||||
|
||||
struct hl_range *create_highlight(
|
||||
size_t start_x, size_t start_y, size_t end_x, size_t end_y,
|
||||
const b_tty_vmode *vmode)
|
||||
const fx_tty_vmode *vmode)
|
||||
{
|
||||
struct hl_range *out = malloc(sizeof *out);
|
||||
if (!out) {
|
||||
@@ -179,7 +179,7 @@ static void move_start_to_meet_end(
|
||||
|
||||
void line_ed_put_highlight(
|
||||
struct line_ed *ed, unsigned long start_x, unsigned long start_y,
|
||||
unsigned long end_x, unsigned long end_y, const struct b_tty_vmode *vmode)
|
||||
unsigned long end_x, unsigned long end_y, const struct fx_tty_vmode *vmode)
|
||||
{
|
||||
struct hl_range *highlight
|
||||
= create_highlight(start_x, start_y, end_x, end_y, vmode);
|
||||
@@ -189,30 +189,30 @@ void line_ed_put_highlight(
|
||||
|
||||
struct hl_range *h2 = NULL;
|
||||
|
||||
b_queue_entry *entry = NULL;
|
||||
entry = b_queue_first(&ed->l_hl_ranges);
|
||||
fx_queue_entry *entry = NULL;
|
||||
entry = fx_queue_first(&ed->l_hl_ranges);
|
||||
|
||||
if (!entry) {
|
||||
b_queue_push_back(&ed->l_hl_ranges, &highlight->h_entry);
|
||||
fx_queue_push_back(&ed->l_hl_ranges, &highlight->h_entry);
|
||||
return;
|
||||
}
|
||||
|
||||
struct hl_range *cur = NULL;
|
||||
enum hl_range_comparison prev_cmp = -1;
|
||||
|
||||
b_queue_entry *insert_before = NULL;
|
||||
b_queue_entry *insert_after = NULL;
|
||||
fx_queue_entry *insert_before = NULL;
|
||||
fx_queue_entry *insert_after = NULL;
|
||||
|
||||
bool end = false;
|
||||
while (entry) {
|
||||
b_queue_entry *next = b_queue_next(entry);
|
||||
cur = b_unbox(struct hl_range, entry, h_entry);
|
||||
fx_queue_entry *next = fx_queue_next(entry);
|
||||
cur = fx_unbox(struct hl_range, entry, h_entry);
|
||||
|
||||
enum hl_range_comparison cmp = compare_hl_ranges(cur, highlight);
|
||||
|
||||
switch (cmp) {
|
||||
case HL_RANGE_A_IN_B:
|
||||
b_queue_delete(&ed->l_hl_ranges, entry);
|
||||
fx_queue_delete(&ed->l_hl_ranges, entry);
|
||||
free(cur);
|
||||
break;
|
||||
case HL_RANGE_B_IN_A:
|
||||
@@ -220,10 +220,10 @@ void line_ed_put_highlight(
|
||||
h2 = create_highlight(
|
||||
0, 0, cur->h_end_x, cur->h_end_y, &cur->h_vmode);
|
||||
move_start_to_meet_end(h2, highlight);
|
||||
b_queue_insert_after(
|
||||
fx_queue_insert_after(
|
||||
&ed->l_hl_ranges, &highlight->h_entry,
|
||||
&cur->h_entry);
|
||||
b_queue_insert_after(
|
||||
fx_queue_insert_after(
|
||||
&ed->l_hl_ranges, &h2->h_entry,
|
||||
&highlight->h_entry);
|
||||
insert_before = insert_after = NULL;
|
||||
@@ -239,7 +239,7 @@ void line_ed_put_highlight(
|
||||
insert_before = entry;
|
||||
break;
|
||||
case HL_RANGE_GREATER:
|
||||
b_queue_insert_before(
|
||||
fx_queue_insert_before(
|
||||
&ed->l_hl_ranges, &highlight->h_entry, entry);
|
||||
insert_before = insert_after = NULL;
|
||||
end = true;
|
||||
@@ -255,32 +255,32 @@ void line_ed_put_highlight(
|
||||
}
|
||||
|
||||
if (insert_before) {
|
||||
b_queue_insert_before(
|
||||
fx_queue_insert_before(
|
||||
&ed->l_hl_ranges, &highlight->h_entry, insert_before);
|
||||
} else if (insert_after) {
|
||||
b_queue_insert_after(
|
||||
fx_queue_insert_after(
|
||||
&ed->l_hl_ranges, &highlight->h_entry, insert_after);
|
||||
}
|
||||
}
|
||||
|
||||
void line_ed_clear_highlights(struct line_ed *ed)
|
||||
{
|
||||
b_queue_entry *entry = b_queue_pop_front(&ed->l_hl_ranges);
|
||||
fx_queue_entry *entry = fx_queue_pop_front(&ed->l_hl_ranges);
|
||||
while (entry) {
|
||||
struct hl_range *range = b_unbox(struct hl_range, entry, h_entry);
|
||||
struct hl_range *range = fx_unbox(struct hl_range, entry, h_entry);
|
||||
free(range);
|
||||
|
||||
entry = b_queue_pop_front(&ed->l_hl_ranges);
|
||||
entry = fx_queue_pop_front(&ed->l_hl_ranges);
|
||||
}
|
||||
}
|
||||
|
||||
void line_ed_print_highlights(struct line_ed *ed)
|
||||
{
|
||||
b_queue_entry *entry = b_queue_first(&ed->l_hl_ranges);
|
||||
fx_queue_entry *entry = fx_queue_first(&ed->l_hl_ranges);
|
||||
while (entry) {
|
||||
struct hl_range *h = b_unbox(struct hl_range, entry, h_entry);
|
||||
struct hl_range *h = fx_unbox(struct hl_range, entry, h_entry);
|
||||
printf("(%zu, %zu) -> (%zu, %zu)\n", h->h_start_x, h->h_start_y,
|
||||
h->h_end_x, h->h_end_y);
|
||||
entry = b_queue_next(entry);
|
||||
entry = fx_queue_next(entry);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user