diff options
Diffstat (limited to 'libcons')
| -rw-r--r-- | libcons/ChangeLog | 18 | ||||
| -rw-r--r-- | libcons/file-changed.c | 4 | ||||
| -rw-r--r-- | libcons/opts-std-startup.c | 24 | ||||
| -rw-r--r-- | libcons/priv.h | 4 | ||||
| -rw-r--r-- | libcons/vcons-input.c | 2 |
5 files changed, 26 insertions, 26 deletions
diff --git a/libcons/ChangeLog b/libcons/ChangeLog index a6e5c3c3..8a79e6ff 100644 --- a/libcons/ChangeLog +++ b/libcons/ChangeLog @@ -9,17 +9,17 @@ * cons.h (cons_scroll_t): New type. (cons_vcons_scrollback): Update prototype. - * priv.h (_cons_jump_down_at_input): New extern. - (_cons_jump_down_at_output): Likewise. + * priv.h (_cons_jump_down_on_input): New extern. + (_cons_jump_down_on_output): Likewise. (_cons_vcons_scrollback): New prototype. - * opts-std-startup.c (OPT_JUMP_DOWN_AT_INPUT): New macro. - (OPT_JUMP_DOWN_AT_OUTPUT): Likewise. - (_cons_jump_down_at_input): New variable. - (_cons_jump_down_at_output): Likewise. - (startup_options): Add new options --jump-down-at-input and - --jump-down-at-output. + * opts-std-startup.c (OPT_JUMP_DOWN_ON_INPUT): New macro. + (OPT_JUMP_DOWN_ON_OUTPUT): Likewise. + (_cons_jump_down_on_input): New variable. + (_cons_jump_down_on_output): Likewise. + (startup_options): Add new options --jump-down-on-input and + --jump-down-on-output. (parse_startup_opt): Handle these new options. - * file-changed.c (cons_S_file_changed): Support the jump down at + * file-changed.c (cons_S_file_changed): Support the jump down on output option. 2002-09-10 Marcus Brinkmann <marcus@gnu.org> diff --git a/libcons/file-changed.c b/libcons/file-changed.c index 21449271..7b78a317 100644 --- a/libcons/file-changed.c +++ b/libcons/file-changed.c @@ -128,7 +128,7 @@ cons_S_file_changed (cons_notify_t notify, natural_t tickno, until absolutely necessary. */ if (vcons->scrolling) { - if (_cons_jump_down_at_output) + if (_cons_jump_down_on_output) _cons_vcons_scrollback (vcons, CONS_SCROLL_ABSOLUTE_LINE, 0); else @@ -234,7 +234,7 @@ cons_S_file_changed (cons_notify_t notify, natural_t tickno, off_t start = change.matrix.start; off_t end = change.matrix.end; - if (vcons->scrolling && _cons_jump_down_at_output) + if (vcons->scrolling && _cons_jump_down_on_output) _cons_vcons_scrollback (vcons, CONS_SCROLL_ABSOLUTE_LINE, 0); if (vcons->state.screen.cur_line >= vcons->scrolling) diff --git a/libcons/opts-std-startup.c b/libcons/opts-std-startup.c index f64f60fc..8bb2d73e 100644 --- a/libcons/opts-std-startup.c +++ b/libcons/opts-std-startup.c @@ -26,8 +26,8 @@ /* Option keys for long-only options in diskfs_common_options. */ #define OPT_SLACK 600 /* --slack */ -#define OPT_JUMP_DOWN_AT_INPUT 601 /* --jump-down-at-input */ -#define OPT_JUMP_DOWN_AT_OUTPUT 602 /* --jump-down-at-output */ +#define OPT_JUMP_DOWN_ON_INPUT 601 /* --jump-down-on-input */ +#define OPT_JUMP_DOWN_ON_OUTPUT 602 /* --jump-down-on-output */ /* Common value for diskfs_common_options and diskfs_default_sync_interval. */ #define DEFAULT_SLACK 100 @@ -39,11 +39,11 @@ server. */ int _cons_slack = DEFAULT_SLACK; -/* If we jump down at input. */ -int _cons_jump_down_at_input; +/* If we jump down on input. */ +int _cons_jump_down_on_input; -/* If we jump down at output. */ -int _cons_jump_down_at_output; +/* If we jump down on output. */ +int _cons_jump_down_on_output; /* The filename of the console server. */ char *_cons_file; @@ -53,9 +53,9 @@ startup_options[] = { { "slack", OPT_SLACK, "RECORDS", 0, "Max number of records the client is" " allowed to lag behind the server (default " DEFAULT_SLACK_STRING ")" }, - { "jump-down-at-input", OPT_JUMP_DOWN_AT_INPUT, NULL, 0, + { "jump-down-on-input", OPT_JUMP_DOWN_ON_INPUT, NULL, 0, "End scrollback when something is entered" }, - { "jump-down-at-output", OPT_JUMP_DOWN_AT_OUTPUT, NULL, 0, + { "jump-down-on-output", OPT_JUMP_DOWN_ON_OUTPUT, NULL, 0, "End scrollback when something is printed" }, { 0, 0 } }; @@ -73,12 +73,12 @@ parse_startup_opt (int opt, char *arg, struct argp_state *state) _cons_slack = atoi (arg); break; - case OPT_JUMP_DOWN_AT_INPUT: - _cons_jump_down_at_input = 1; + case OPT_JUMP_DOWN_ON_INPUT: + _cons_jump_down_on_input = 1; break; - case OPT_JUMP_DOWN_AT_OUTPUT: - _cons_jump_down_at_output = 1; + case OPT_JUMP_DOWN_ON_OUTPUT: + _cons_jump_down_on_output = 1; break; case ARGP_KEY_ARG: diff --git a/libcons/priv.h b/libcons/priv.h index 9f3fd7b6..598590e5 100644 --- a/libcons/priv.h +++ b/libcons/priv.h @@ -26,10 +26,10 @@ extern int _cons_slack; /* If we jump down at input. */ -extern int _cons_jump_down_at_input; +extern int _cons_jump_down_on_input; /* If we jump down at output. */ -extern int _cons_jump_down_at_output; +extern int _cons_jump_down_on_output; /* The filename of the console server. */ extern char *_cons_file; diff --git a/libcons/vcons-input.c b/libcons/vcons-input.c index 83cc8846..95f2b972 100644 --- a/libcons/vcons-input.c +++ b/libcons/vcons-input.c @@ -33,7 +33,7 @@ cons_vcons_input (vcons_t vcons, char *buf, size_t size) mutex_lock (&vcons->lock); - if (vcons->scrolling && _cons_jump_down_at_input) + if (vcons->scrolling && _cons_jump_down_on_input) _cons_vcons_scrollback (vcons, CONS_SCROLL_ABSOLUTE_LINE, 0); do |