circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-28 01:08:53 +00:00
Code Issues Projects Releases Wiki Activity

Revert attempt to fix stray updates, turns out it was clock :-/.

Browse Source
This commit is contained in:
Nicholas Marriott 2008-06-04 19:20:10 +00:00
parent 39be570b20
commit 7842d29673
5 changed files with 14 additions and 30 deletions

5
TODO
View File

@ -64,6 +64,7 @@
- different screen model? layers perhaps? hmm
- cfg file improvements
- proper per-window options (per-session list of window ranges?)
- better work on modes: search, back word, forward word, etc
---
[18:20] *priteau* i found something in tmux that could be tweaked to be better
@ -76,9 +77,9 @@
- chmod +x socket when any client is attached (upd in lost/accept)
- clear EOL etc CANNOT rely on term using the current colour/attr and probably
should not emulate it doing so
- status bar customisation variables, date/time, show-activity, show-last-window
string-left, string-right - pass through strptime and print...
- status bar customisation variables, show-activity, show-last-window
- show-options
- let server die when last session does
- each command should have a print op as well for list keys
- fix occasion start server problems
- test and fix wsvt25

7
input.c
View File

@ -1,4 +1,4 @@
/* $Id: input.c,v 1.48 2008-06-04 18:50:34 nicm Exp $ */
/* $Id: input.c,v 1.49 2008-06-04 19:20:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -223,6 +223,8 @@ input_parse(struct window *w)
else
screen_write_start(&ictx->ctx, &w->base, NULL, NULL);
if (ictx->off != ictx->len)
w->flags |= WINDOW_ACTIVITY;
while (ictx->off < ictx->len) {
ch = ictx->buf[ictx->off++];
ictx->state(ch, ictx);
@ -481,8 +483,7 @@ input_handle_character(u_char ch, struct input_ctx *ictx)
{
log_debug2("-- ch %zu: %hhu (%c)", ictx->off, ch, ch);
if (screen_write_put_character(&ictx->ctx, ch))
ictx->w->flags |= WINDOW_ACTIVITY;
screen_write_put_character(&ictx->ctx, ch);
}
void

10
screen-display.c
View File

@ -1,4 +1,4 @@
/* $Id: screen-display.c,v 1.15 2008-06-04 18:50:34 nicm Exp $ */
/* $Id: screen-display.c,v 1.16 2008-06-04 19:20:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -22,14 +22,6 @@
#include "tmux.h"
/* Get a cell. */
void
screen_display_get_cell(struct screen *s,
u_int px, u_int py, u_char *data, u_char *attr, u_char *colr)
{
screen_get_cell(s, screen_x(s, px), screen_y(s, py), data, attr, colr);
}
/* Set a cell. */
void
screen_display_set_cell(

16
screen-write.c
View File

@ -1,4 +1,4 @@
/* $Id: screen-write.c,v 1.6 2008-06-04 18:50:34 nicm Exp $ */
/* $Id: screen-write.c,v 1.7 2008-06-04 19:20:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -98,12 +98,10 @@ screen_write_set_title(struct screen_write_ctx *ctx, char *title)
}
/* Put a character. */
int
void
screen_write_put_character(struct screen_write_ctx *ctx, u_char ch)
{
struct screen *s = ctx->s;
u_char data, attr, colr;
int n;
if (s->cx == screen_size_x(s)) {
s->cx = 0;
@ -112,20 +110,14 @@ screen_write_put_character(struct screen_write_ctx *ctx, u_char ch)
screen_write_cursor_down_scroll(ctx);
} else if (!screen_in_x(s, s->cx) || !screen_in_y(s, s->cy)) {
SCREEN_DEBUG(s);
return (0);
return;
}
screen_display_get_cell(s, s->cx, s->cy, &data, &attr, &colr);
if (ch != data || s->attr != attr || colr != s->colr) {
screen_display_set_cell(s, s->cx, s->cy, ch, s->attr, s->colr);
n = 1;
} else
n = 0;
screen_display_set_cell(s, s->cx, s->cy, ch, s->attr, s->colr);
s->cx++;
if (ctx->write != NULL)
ctx->write(ctx->data, TTY_CHARACTER, ch);
return (n);
}
/* Put a string right-justified. */

6
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.130 2008-06-04 18:50:35 nicm Exp $ */
/* $Id: tmux.h,v 1.131 2008-06-04 19:20:10 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -919,8 +919,6 @@ void input_parse(struct window *);
void input_key(struct window *, int);
/* screen-display.c */
void screen_display_get_cell(
struct screen *, u_int, u_int, u_char *, u_char *, u_char *);
void screen_display_set_cell(
struct screen *, u_int, u_int, u_char, u_char, u_char);
void screen_display_make_lines(struct screen *, u_int, u_int);
@ -948,7 +946,7 @@ void screen_write_start(struct screen_write_ctx *,
struct screen *, void (*)(void *, int, ...), void *);
void screen_write_stop(struct screen_write_ctx *);
void screen_write_set_title(struct screen_write_ctx *, char *);
int screen_write_put_character(struct screen_write_ctx *, u_char);
void screen_write_put_character(struct screen_write_ctx *, u_char);
size_t printflike2 screen_write_put_string_rjust(
struct screen_write_ctx *, const char *, ...);
void printflike2 screen_write_put_string(