~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase commit.title size from 75 to 128
[tig]
/
tig.c
diff --git
a/tig.c
b/tig.c
index
3397489
..
5255e14
100644
(file)
--- a/
tig.c
+++ b/
tig.c
@@
-12,7
+12,7
@@
*/
#ifndef VERSION
*/
#ifndef VERSION
-#define VERSION "tig-0.
4
.git"
+#define VERSION "tig-0.
5
.git"
#endif
#ifndef DEBUG
#endif
#ifndef DEBUG
@@
-451,6
+451,17
@@
parse_options(int argc, char *argv[])
for (i = 1; i < argc; i++) {
char *opt = argv[i];
for (i = 1; i < argc; i++) {
char *opt = argv[i];
+ if (!strcmp(opt, "log") ||
+ !strcmp(opt, "diff") ||
+ !strcmp(opt, "show")) {
+ opt_request = opt[0] == 'l'
+ ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+ break;
+ }
+
+ if (opt[0] && opt[0] != '-')
+ break;
+
if (!strcmp(opt, "-l")) {
opt_request = REQ_VIEW_LOG;
continue;
if (!strcmp(opt, "-l")) {
opt_request = REQ_VIEW_LOG;
continue;
@@
-486,17
+497,6
@@
parse_options(int argc, char *argv[])
break;
}
break;
}
- if (!strcmp(opt, "log") ||
- !strcmp(opt, "diff") ||
- !strcmp(opt, "show")) {
- opt_request = opt[0] == 'l'
- ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
- break;
- }
-
- if (opt[0] && opt[0] != '-')
- break;
-
die("unknown option '%s'\n\n%s", opt, usage);
}
die("unknown option '%s'\n\n%s", opt, usage);
}
@@
-730,9
+730,6
@@
static struct keybinding default_keybindings[] = {
{ 'g', REQ_TOGGLE_REV_GRAPH },
{ ':', REQ_PROMPT },
{ 'g', REQ_TOGGLE_REV_GRAPH },
{ ':', REQ_PROMPT },
- /* wgetch() with nodelay() enabled returns ERR when there's no input. */
- { ERR, REQ_NONE },
-
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
};
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
};
@@
-767,10
+764,9
@@
static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
static void
add_keybinding(enum keymap keymap, enum request request, int key)
{
static void
add_keybinding(enum keymap keymap, enum request request, int key)
{
- struct keybinding *keybinding
= keybindings[keymap]
;
+ struct keybinding *keybinding;
- if (!keybinding)
- keybinding = calloc(1, sizeof(*keybinding));
+ keybinding = calloc(1, sizeof(*keybinding));
if (!keybinding)
die("Failed to allocate keybinding");
if (!keybinding)
die("Failed to allocate keybinding");
@@
-1165,6
+1161,9
@@
struct view_ops;
static struct view *display[2];
static unsigned int current_view;
static struct view *display[2];
static unsigned int current_view;
+/* Reading from the prompt? */
+static bool input_mode = FALSE;
+
#define foreach_displayed_view(view, i) \
for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
#define foreach_displayed_view(view, i) \
for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
@@
-1302,7
+1301,10
@@
redraw_view_from(struct view *view, int lineno)
}
redrawwin(view->win);
}
redrawwin(view->win);
- wrefresh(view->win);
+ if (input_mode)
+ wnoutrefresh(view->win);
+ else
+ wrefresh(view->win);
}
static void
}
static void
@@
-1362,10
+1364,14
@@
update_view_title(struct view *view)
else
wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
else
wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
- werase(view->title);
mvwaddnstr(view->title, 0, 0, buf, bufpos);
mvwaddnstr(view->title, 0, 0, buf, bufpos);
+ wclrtoeol(view->title);
wmove(view->title, 0, view->width - 1);
wmove(view->title, 0, view->width - 1);
- wrefresh(view->title);
+
+ if (input_mode)
+ wnoutrefresh(view->title);
+ else
+ wrefresh(view->title);
}
static void
}
static void
@@
-2677,7
+2683,7
@@
static struct view_ops blob_ops = {
struct commit {
char id[SIZEOF_REV]; /* SHA1 ID. */
struct commit {
char id[SIZEOF_REV]; /* SHA1 ID. */
- char title[
75];
/* First line of the commit message. */
+ char title[
128];
/* First line of the commit message. */
char author[75]; /* Author of the commit. */
struct tm time; /* Date from the author ident. */
struct ref **refs; /* Repository references. */
char author[75]; /* Author of the commit. */
struct tm time; /* Date from the author ident. */
struct ref **refs; /* Repository references. */
@@
-3122,26
+3128,30
@@
static bool cursed = FALSE;
/* The status window is used for polling keystrokes. */
static WINDOW *status_win;
/* The status window is used for polling keystrokes. */
static WINDOW *status_win;
+static bool status_empty = TRUE;
+
/* Update status and title window. */
static void
report(const char *msg, ...)
{
/* Update status and title window. */
static void
report(const char *msg, ...)
{
- static bool empty = TRUE;
struct view *view = display[current_view];
struct view *view = display[current_view];
- if (!empty || *msg) {
+ if (input_mode)
+ return;
+
+ if (!status_empty || *msg) {
va_list args;
va_start(args, msg);
va_list args;
va_start(args, msg);
- werase(status_win);
wmove(status_win, 0, 0);
if (*msg) {
vwprintw(status_win, msg, args);
wmove(status_win, 0, 0);
if (*msg) {
vwprintw(status_win, msg, args);
- empty = FALSE;
+
status_
empty = FALSE;
} else {
} else {
- empty = TRUE;
+
status_
empty = TRUE;
}
}
+ wclrtoeol(status_win);
wrefresh(status_win);
va_end(args);
wrefresh(status_win);
va_end(args);
@@
-3211,10
+3221,16
@@
read_prompt(const char *prompt)
struct view *view;
int i, key;
struct view *view;
int i, key;
+ input_mode = TRUE;
+
foreach_view (view, i)
update_view(view);
foreach_view (view, i)
update_view(view);
- report("%s%.*s", prompt, pos, buf);
+ input_mode = FALSE;
+
+ mvwprintw(status_win, 0, 0, "%s%.*s", prompt, pos, buf);
+ wclrtoeol(status_win);
+
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
switch (key) {
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
switch (key) {
@@
-3249,11
+3265,12
@@
read_prompt(const char *prompt)
}
}
}
}
- if (status == CANCEL) {
- /* Clear the status window */
- report("");
+ /* Clear the status window */
+ status_empty = FALSE;
+ report("");
+
+ if (status == CANCEL)
return NULL;
return NULL;
- }
buf[pos++] = 0;
buf[pos++] = 0;
@@
-3512,6
+3529,13
@@
main(int argc, char *argv[])
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
+ /* wgetch() with nodelay() enabled returns ERR when there's no
+ * input. */
+ if (key == ERR) {
+ request = REQ_NONE;
+ continue;
+ }
+
request = get_keybinding(display[current_view]->keymap, key);
/* Some low-level request handling. This keeps access to
request = get_keybinding(display[current_view]->keymap, key);
/* Some low-level request handling. This keeps access to