Skip to content

Commit

Permalink
Yet more renames (EditorWin -> Win)
Browse files Browse the repository at this point in the history
  • Loading branch information
@martanne
martanne committed Apr 22, 2015
1 parent 7318931 commit acb864c
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 52 deletions.
58 changes: 29 additions & 29 deletions editor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

static void file_free(Editor *ed, File *file);
static File *file_new(Editor *ed, const char *filename);
static EditorWin *editor_window_new_file(Editor *ed, File *file);
static void editor_window_free(EditorWin *win);
static Win *window_new_file(Editor *ed, File *file);
static void window_free(Win *win);
static void editor_windows_invalidate(Editor *ed, size_t start, size_t end);

static void editor_window_selection_changed(void *data, Filerange *sel) {
File *file = ((EditorWin*)data)->file;
static void window_selection_changed(void *win, Filerange *sel) {
File *file = ((Win*)win)->file;
if (text_range_valid(sel)) {
file->marks[MARK_SELECTION_START] = text_mark_set(file->text, sel->start);
file->marks[MARK_SELECTION_END] = text_mark_set(file->text, sel->end);
Expand All @@ -24,7 +24,7 @@ void editor_windows_arrange(Editor *ed, enum UiLayout layout) {
ed->ui->arrange(ed->ui, layout);
}

bool editor_window_reload(EditorWin *win) {
bool editor_window_reload(Win *win) {
const char *filename = text_filename_get(win->file->text);
/* can't reload unsaved file */
if (!filename)
Expand All @@ -38,8 +38,8 @@ bool editor_window_reload(EditorWin *win) {
return true;
}

bool editor_window_split(EditorWin *original) {
EditorWin *win = editor_window_new_file(original->editor, original->file);
bool editor_window_split(Win *original) {
Win *win = window_new_file(original->editor, original->file);
if (!win)
return false;
win->file = original->file;
Expand All @@ -50,13 +50,13 @@ bool editor_window_split(EditorWin *original) {
return true;
}

void editor_window_jumplist_add(EditorWin *win, size_t pos) {
void editor_window_jumplist_add(Win *win, size_t pos) {
Mark mark = text_mark_set(win->file->text, pos);
if (mark && win->jumplist)
ringbuf_add(win->jumplist, mark);
}

size_t editor_window_jumplist_prev(EditorWin *win) {
size_t editor_window_jumplist_prev(Win *win) {
size_t cur = view_cursor_get(win->view);
while (win->jumplist) {
Mark mark = ringbuf_prev(win->jumplist);
Expand All @@ -69,7 +69,7 @@ size_t editor_window_jumplist_prev(EditorWin *win) {
return cur;
}

size_t editor_window_jumplist_next(EditorWin *win) {
size_t editor_window_jumplist_next(Win *win) {
size_t cur = view_cursor_get(win->view);
while (win->jumplist) {
Mark mark = ringbuf_next(win->jumplist);
Expand All @@ -82,12 +82,12 @@ size_t editor_window_jumplist_next(EditorWin *win) {
return cur;
}

void editor_window_jumplist_invalidate(EditorWin *win) {
void editor_window_jumplist_invalidate(Win *win) {
if (win->jumplist)
ringbuf_invalidate(win->jumplist);
}

size_t editor_window_changelist_prev(EditorWin *win) {
size_t editor_window_changelist_prev(Win *win) {
size_t pos = view_cursor_get(win->view);
if (pos != win->changelist.pos)
win->changelist.index = 0;
Expand All @@ -101,7 +101,7 @@ size_t editor_window_changelist_prev(EditorWin *win) {
return win->changelist.pos;
}

size_t editor_window_changelist_next(EditorWin *win) {
size_t editor_window_changelist_next(Win *win) {
size_t pos = view_cursor_get(win->view);
if (pos != win->changelist.pos)
win->changelist.index = 0;
Expand All @@ -120,7 +120,7 @@ void editor_resize(Editor *ed) {
}

void editor_window_next(Editor *ed) {
EditorWin *sel = ed->win;
Win *sel = ed->win;
if (!sel)
return;
ed->win = ed->win->next;
Expand All @@ -130,7 +130,7 @@ void editor_window_next(Editor *ed) {
}

void editor_window_prev(Editor *ed) {
EditorWin *sel = ed->win;
Win *sel = ed->win;
if (!sel)
return;
ed->win = ed->win->prev;
Expand All @@ -140,7 +140,7 @@ void editor_window_prev(Editor *ed) {
}

static void editor_windows_invalidate(Editor *ed, size_t start, size_t end) {
for (EditorWin *win = ed->windows; win; win = win->next) {
for (Win *win = ed->windows; win; win = win->next) {
if (ed->win != win && ed->win->file == win->file) {
Filerange view = view_viewport_get(win->view);
if ((view.start <= start && start <= view.end) ||
Expand All @@ -158,7 +158,7 @@ int editor_tabwidth_get(Editor *ed) {
void editor_tabwidth_set(Editor *ed, int tabwidth) {
if (tabwidth < 1 || tabwidth > 8)
return;
for (EditorWin *win = ed->windows; win; win = win->next)
for (Win *win = ed->windows; win; win = win->next)
view_tabwidth_set(win->view, tabwidth);
ed->tabwidth = tabwidth;
}
Expand Down Expand Up @@ -217,7 +217,7 @@ void editor_suspend(Editor *ed) {
ed->ui->suspend(ed->ui);
}

static void editor_window_free(EditorWin *win) {
static void window_free(Win *win) {
if (!win)
return;
Editor *ed = win->editor;
Expand All @@ -228,21 +228,21 @@ static void editor_window_free(EditorWin *win) {
free(win);
}

static EditorWin *editor_window_new_file(Editor *ed, File *file) {
EditorWin *win = calloc(1, sizeof(EditorWin));
static Win *window_new_file(Editor *ed, File *file) {
Win *win = calloc(1, sizeof(Win));
if (!win)
return NULL;
win->editor = ed;
win->file = file;
win->events = (ViewEvent) {
.data = win,
.selection = editor_window_selection_changed,
.selection = window_selection_changed,
};
win->jumplist = ringbuf_alloc(31);
win->view = view_new(file->text, &win->events);
win->ui = ed->ui->window_new(ed->ui, win->view, file->text);
if (!win->jumplist || !win->view || !win->ui) {
editor_window_free(win);
window_free(win);
return NULL;
}
view_tabwidth_set(win->view, ed->tabwidth);
Expand Down Expand Up @@ -319,7 +319,7 @@ bool editor_window_new(Editor *ed, const char *filename) {
File *file = file_new(ed, filename);
if (!file)
return false;
EditorWin *win = editor_window_new_file(ed, file);
Win *win = window_new_file(ed, file);
if (!win) {
file_free(ed, file);
return false;
Expand Down Expand Up @@ -348,15 +348,15 @@ bool editor_window_new_fd(Editor *ed, int fd) {
file_free(ed, file);
return false;
}
EditorWin *win = editor_window_new_file(ed, file);
Win *win = window_new_file(ed, file);
if (!win) {
file_free(ed, file);
return false;
}
return true;
}

void editor_window_close(EditorWin *win) {
void editor_window_close(Win *win) {
Editor *ed = win->editor;
file_free(ed, win->file);
if (win->prev)
Expand All @@ -367,7 +367,7 @@ void editor_window_close(EditorWin *win) {
ed->windows = win->next;
if (ed->win == win)
ed->win = win->next ? win->next : win->prev;
editor_window_free(win);
window_free(win);
if (ed->win)
ed->ui->window_focus(ed->win->ui);
editor_draw(ed);
Expand All @@ -383,7 +383,7 @@ Editor *editor_new(Ui *ui) {
ed->ui->init(ed->ui, ed);
ed->tabwidth = 8;
ed->expandtab = false;
if (!(ed->prompt = calloc(1, sizeof(EditorWin))))
if (!(ed->prompt = calloc(1, sizeof(Win))))
goto err;
if (!(ed->prompt->file = calloc(1, sizeof(File))))
goto err;
Expand All @@ -407,7 +407,7 @@ void editor_free(Editor *ed) {
while (ed->windows)
editor_window_close(ed->windows);
file_free(ed, ed->prompt->file);
editor_window_free(ed->prompt);
window_free(ed->prompt);
text_regex_free(ed->search_pattern);
for (int i = 0; i < REG_LAST; i++)
register_free(&ed->registers[i]);
Expand Down Expand Up @@ -487,7 +487,7 @@ void editor_info_hide(Editor *ed) {
ed->ui->info_hide(ed->ui);
}

void editor_window_options(EditorWin *win, enum UiOption options) {
void editor_window_options(Win *win, enum UiOption options) {
win->ui->options(win->ui, options);
}

34 changes: 17 additions & 17 deletions editor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <stdbool.h>

typedef struct Editor Editor;
typedef struct EditorWin EditorWin;
typedef struct Win Win;

#include "ui.h"
#include "window.h"
Expand Down Expand Up @@ -203,28 +203,28 @@ typedef struct {
size_t pos; /* where the current change occured */
} ChangeList;

struct EditorWin {
struct Win {
Editor *editor; /* editor instance to which this window belongs */
UiWin *ui;
File *file; /* file being displayed in this window */
View *view; /* currently displayed part of underlying text */
ViewEvent events;
RingBuffer *jumplist; /* LRU jump management */
ChangeList changelist; /* state for iterating through least recently changes */
EditorWin *prev, *next; /* neighbouring windows */
Win *prev, *next; /* neighbouring windows */
};

struct Editor {
Ui *ui;
File *files;
EditorWin *windows; /* list of windows */
EditorWin *win; /* currently active window */
Win *windows; /* list of windows */
Win *win; /* currently active window */
Syntax *syntaxes; /* NULL terminated array of syntax definitions */
Register registers[REG_LAST]; /* register used for copy and paste */
Macro macros[26]; /* recorded macros */
Macro *recording, *last_recording;/* currently and least recently recorded macro */
EditorWin *prompt; /* 1-line height window to get user input */
EditorWin *prompt_window; /* window which was focused before prompt was shown */
Win *prompt; /* 1-line height window to get user input */
Win *prompt_window; /* window which was focused before prompt was shown */
char prompt_type; /* command ':' or search '/','?' prompt */
Regex *search_pattern; /* last used search pattern */
char search_char[8]; /* last used character to search for via 'f', 'F', 't', 'T' */
Expand Down Expand Up @@ -279,22 +279,22 @@ void editor_syntax_unload(Editor*);
bool editor_window_new(Editor*, const char *filename);
bool editor_window_new_fd(Editor*, int fd);
/* reload the file currently displayed in the window from disk */
bool editor_window_reload(EditorWin*);
void editor_window_close(EditorWin*);
bool editor_window_reload(Win*);
void editor_window_close(Win*);
/* split the given window. changes to the displayed text will be reflected
* in both windows */
bool editor_window_split(EditorWin*);
bool editor_window_split(Win*);
/* focus the next / previous window */
void editor_window_next(Editor*);
void editor_window_prev(Editor*);

void editor_window_jumplist_add(EditorWin*, size_t pos);
size_t editor_window_jumplist_prev(EditorWin*);
size_t editor_window_jumplist_next(EditorWin*);
void editor_window_jumplist_invalidate(EditorWin*);
void editor_window_jumplist_add(Win*, size_t pos);
size_t editor_window_jumplist_prev(Win*);
size_t editor_window_jumplist_next(Win*);
void editor_window_jumplist_invalidate(Win*);

size_t editor_window_changelist_prev(EditorWin*);
size_t editor_window_changelist_next(EditorWin*);
size_t editor_window_changelist_prev(Win*);
size_t editor_window_changelist_next(Win*);
/* rearrange all windows either vertically or horizontally */
void editor_windows_arrange(Editor*, enum UiLayout);
/* display a user prompt with a certain title and default text */
Expand All @@ -310,7 +310,7 @@ void editor_prompt_set(Editor*, const char *line);
/* display a message to the user */
void editor_info_show(Editor*, const char *msg, ...);
void editor_info_hide(Editor*);
void editor_window_options(EditorWin*, enum UiOption options);
void editor_window_options(Win*, enum UiOption options);

/* look up a curses color pair for the given combination of fore and
* background color */
Expand Down
12 changes: 6 additions & 6 deletions vis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ static bool cmd_saveas(Filerange*, enum CmdOpt, const char *argv[]);
static void action_reset(Action *a);
static void switchmode_to(Mode *new_mode);
static bool vis_window_new(const char *file);
static bool vis_window_split(EditorWin *win);
static bool vis_window_split(Win *win);

#include "config.h"

Expand Down Expand Up @@ -1444,7 +1444,7 @@ static bool cmd_open(Filerange *range, enum CmdOpt opt, const char *argv[]) {
return true;
}

static bool is_view_closeable(EditorWin *win) {
static bool is_view_closeable(Win *win) {
if (!text_modified(win->file->text))
return true;
return win->file->refcount > 1;
Expand All @@ -1455,7 +1455,7 @@ static void info_unsaved_changes(void) {
}

static bool cmd_edit(Filerange *range, enum CmdOpt opt, const char *argv[]) {
EditorWin *oldwin = vis->win;
Win *oldwin = vis->win;
if (!(opt & CMD_OPT_FORCE) && !is_view_closeable(oldwin)) {
info_unsaved_changes();
return false;
Expand Down Expand Up @@ -1493,7 +1493,7 @@ static bool cmd_bdelete(Filerange *range, enum CmdOpt opt, const char *argv[]) {
info_unsaved_changes();
return false;
}
for (EditorWin *next, *win = vis->windows; win; win = next) {
for (Win *next, *win = vis->windows; win; win = next) {
next = win->next;
if (win->file->text == txt)
editor_window_close(win);
Expand All @@ -1504,7 +1504,7 @@ static bool cmd_bdelete(Filerange *range, enum CmdOpt opt, const char *argv[]) {
}

static bool cmd_qall(Filerange *range, enum CmdOpt opt, const char *argv[]) {
for (EditorWin *next, *win = vis->windows; win; win = next) {
for (Win *next, *win = vis->windows; win; win = next) {
next = win->next;
if (!text_modified(vis->win->file->text) || (opt & CMD_OPT_FORCE))
editor_window_close(win);
Expand Down Expand Up @@ -1837,7 +1837,7 @@ static bool vis_window_new_fd(int fd) {
return true;
}

static bool vis_window_split(EditorWin *win) {
static bool vis_window_split(Win *win) {
if (!editor_window_split(win))
return false;
Syntax *s = view_syntax_get(vis->win->view);
Expand Down

0 comments on commit acb864c

Please sign in to comment.