The branch, master has been updated
via 582c2671ddce5a8cdd6d022c7c67fe683ce71bf1 (commit)
via 0bb9d51965f1920f303f8c9abd8133ce99d5818f (commit)
via 6d9f936ff22e9488bec90e22338a5543fbeb25fc (commit)
from 594348440e42ac0c588369f1578b21792974600d (commit)
- Log -----------------------------------------------------------------
commit 582c2671ddce5a8cdd6d022c7c67fe683ce71bf1
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Having three *clock* files is ridiculous, remove clock.c.
---
Makefile.am | 1 -
clock.c | 166 -------------------------------------------------------
screen-redraw.c | 2 +-
tmux.h | 5 +-
window-clock.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
5 files changed, 143 insertions(+), 174 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a9ad5b9..d305db9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,6 @@ dist_tmux_SOURCES = \
attributes.c \
cfg.c \
client.c \
- clock.c \
cmd-attach-session.c \
cmd-bind-key.c \
cmd-break-pane.c \
diff --git a/clock.c b/clock.c
deleted file mode 100644
index ec74288..0000000
--- a/clock.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2009 Nicholas Marriott <n...@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <string.h>
-#include <time.h>
-
-#include "tmux.h"
-
-const char clock_table[14][5][5] = {
- { { 1,1,1,1,1 }, /* 0 */
- { 1,0,0,0,1 },
- { 1,0,0,0,1 },
- { 1,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 0,0,0,0,1 }, /* 1 */
- { 0,0,0,0,1 },
- { 0,0,0,0,1 },
- { 0,0,0,0,1 },
- { 0,0,0,0,1 } },
- { { 1,1,1,1,1 }, /* 2 */
- { 0,0,0,0,1 },
- { 1,1,1,1,1 },
- { 1,0,0,0,0 },
- { 1,1,1,1,1 } },
- { { 1,1,1,1,1 }, /* 3 */
- { 0,0,0,0,1 },
- { 1,1,1,1,1 },
- { 0,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 1,0,0,0,1 }, /* 4 */
- { 1,0,0,0,1 },
- { 1,1,1,1,1 },
- { 0,0,0,0,1 },
- { 0,0,0,0,1 } },
- { { 1,1,1,1,1 }, /* 5 */
- { 1,0,0,0,0 },
- { 1,1,1,1,1 },
- { 0,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 1,1,1,1,1 }, /* 6 */
- { 1,0,0,0,0 },
- { 1,1,1,1,1 },
- { 1,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 1,1,1,1,1 }, /* 7 */
- { 0,0,0,0,1 },
- { 0,0,0,0,1 },
- { 0,0,0,0,1 },
- { 0,0,0,0,1 } },
- { { 1,1,1,1,1 }, /* 8 */
- { 1,0,0,0,1 },
- { 1,1,1,1,1 },
- { 1,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 1,1,1,1,1 }, /* 9 */
- { 1,0,0,0,1 },
- { 1,1,1,1,1 },
- { 0,0,0,0,1 },
- { 1,1,1,1,1 } },
- { { 0,0,0,0,0 }, /* : */
- { 0,0,1,0,0 },
- { 0,0,0,0,0 },
- { 0,0,1,0,0 },
- { 0,0,0,0,0 } },
- { { 1,1,1,1,1 }, /* A */
- { 1,0,0,0,1 },
- { 1,1,1,1,1 },
- { 1,0,0,0,1 },
- { 1,0,0,0,1 } },
- { { 1,1,1,1,1 }, /* P */
- { 1,0,0,0,1 },
- { 1,1,1,1,1 },
- { 1,0,0,0,0 },
- { 1,0,0,0,0 } },
- { { 1,0,0,0,1 }, /* M */
- { 1,1,0,1,1 },
- { 1,0,1,0,1 },
- { 1,0,0,0,1 },
- { 1,0,0,0,1 } },
-};
-
-void
-clock_draw(struct screen_write_ctx *ctx, int colour, int style)
-{
- struct screen *s = ctx->s;
- struct grid_cell gc;
- char tim[64], *ptr;
- time_t t;
- struct tm *tm;
- u_int i, j, x, y, idx;
-
- t = time(NULL);
- tm = localtime(&t);
- if (style == 0) {
- strftime(tim, sizeof tim, "%l:%M ", localtime(&t));
- if (tm->tm_hour >= 12)
- strlcat(tim, "PM", sizeof tim);
- else
- strlcat(tim, "AM", sizeof tim);
- } else
- strftime(tim, sizeof tim, "%H:%M", tm);
-
-
- screen_write_clearscreen(ctx);
-
- if (screen_size_x(s) < 6 * strlen(tim) || screen_size_y(s) < 6) {
- if (screen_size_x(s) >= strlen(tim) && screen_size_y(s) != 0) {
- x = (screen_size_x(s) / 2) - (strlen(tim) / 2);
- y = screen_size_y(s) / 2;
- screen_write_cursormove(ctx, x, y);
-
- memcpy(&gc, &grid_default_cell, sizeof gc);
- colour_set_fg(&gc, colour);
- screen_write_puts(ctx, &gc, "%s", tim);
- }
- return;
- }
-
- x = (screen_size_x(s) / 2) - 3 * strlen(tim);
- y = (screen_size_y(s) / 2) - 3;
-
- memcpy(&gc, &grid_default_cell, sizeof gc);
- colour_set_bg(&gc, colour);
- for (ptr = tim; *ptr != '\0'; ptr++) {
- if (*ptr >= '0' && *ptr <= '9')
- idx = *ptr - '0';
- else if (*ptr == ':')
- idx = 10;
- else if (*ptr == 'A')
- idx = 11;
- else if (*ptr == 'P')
- idx = 12;
- else if (*ptr == 'M')
- idx = 13;
- else {
- x += 6;
- continue;
- }
-
- for (j = 0; j < 5; j++) {
- for (i = 0; i < 5; i++) {
- screen_write_cursormove(ctx, x + i, y + j);
- if (clock_table[idx][j][i])
- screen_write_putc(ctx, &gc, ' ');
- }
- }
- x += 6;
- }
-}
diff --git a/screen-redraw.c b/screen-redraw.c
index 6db1064..6438034 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -381,7 +381,7 @@ screen_redraw_draw_number(struct client *c, struct
window_pane *wp)
for (j = 0; j < 5; j++) {
for (i = px; i < px + 5; i++) {
tty_cursor(tty, xoff + i, yoff + py + j);
- if (clock_table[idx][j][i - px])
+ if (window_clock_table[idx][j][i - px])
tty_putc(tty, ' ');
}
}
diff --git a/tmux.h b/tmux.h
index ec5cf55..23b1b46 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1710,10 +1710,6 @@ char *paste_print(struct paste_buffer *,
size_t);
void paste_send_pane(struct paste_buffer *, struct window_pane *,
const char *, int);
-/* clock.c */
-extern const char clock_table[14][5][5];
-void clock_draw(struct screen_write_ctx *, int, int);
-
/* arguments.c */
int args_cmp(struct args_entry *, struct args_entry *);
RB_PROTOTYPE(args_tree, args_entry, entry, args_cmp);
@@ -2219,6 +2215,7 @@ void layout_set_active_changed(struct
window *);
/* window-clock.c */
extern const struct window_mode window_clock_mode;
+extern const char window_clock_table[14][5][5];
/* window-copy.c */
extern const struct window_mode window_copy_mode;
diff --git a/window-clock.c b/window-clock.c
index 61cf150..9765b12 100644
--- a/window-clock.c
+++ b/window-clock.c
@@ -46,6 +46,79 @@ struct window_clock_mode_data {
time_t tim;
};
+const char window_clock_table[14][5][5] = {
+ { { 1,1,1,1,1 }, /* 0 */
+ { 1,0,0,0,1 },
+ { 1,0,0,0,1 },
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 0,0,0,0,1 }, /* 1 */
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 } },
+ { { 1,1,1,1,1 }, /* 2 */
+ { 0,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 1,0,0,0,0 },
+ { 1,1,1,1,1 } },
+ { { 1,1,1,1,1 }, /* 3 */
+ { 0,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 0,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 1,0,0,0,1 }, /* 4 */
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 } },
+ { { 1,1,1,1,1 }, /* 5 */
+ { 1,0,0,0,0 },
+ { 1,1,1,1,1 },
+ { 0,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 1,1,1,1,1 }, /* 6 */
+ { 1,0,0,0,0 },
+ { 1,1,1,1,1 },
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 1,1,1,1,1 }, /* 7 */
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 },
+ { 0,0,0,0,1 } },
+ { { 1,1,1,1,1 }, /* 8 */
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 1,1,1,1,1 }, /* 9 */
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 0,0,0,0,1 },
+ { 1,1,1,1,1 } },
+ { { 0,0,0,0,0 }, /* : */
+ { 0,0,1,0,0 },
+ { 0,0,0,0,0 },
+ { 0,0,1,0,0 },
+ { 0,0,0,0,0 } },
+ { { 1,1,1,1,1 }, /* A */
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 1,0,0,0,1 },
+ { 1,0,0,0,1 } },
+ { { 1,1,1,1,1 }, /* P */
+ { 1,0,0,0,1 },
+ { 1,1,1,1,1 },
+ { 1,0,0,0,0 },
+ { 1,0,0,0,0 } },
+ { { 1,0,0,0,1 }, /* M */
+ { 1,1,0,1,1 },
+ { 1,0,1,0,1 },
+ { 1,0,0,0,1 },
+ { 1,0,0,0,1 } },
+};
+
struct screen *
window_clock_init(struct window_pane *wp)
{
@@ -114,11 +187,77 @@ window_clock_draw_screen(struct window_pane *wp)
struct window_clock_mode_data *data = wp->modedata;
struct screen_write_ctx ctx;
int colour, style;
+ struct screen *s = &data->screen;
+ struct grid_cell gc;
+ char tim[64], *ptr;
+ time_t t;
+ struct tm *tm;
+ u_int i, j, x, y, idx;
colour = options_get_number(&wp->window->options, "clock-mode-colour");
style = options_get_number(&wp->window->options, "clock-mode-style");
- screen_write_start(&ctx, NULL, &data->screen);
- clock_draw(&ctx, colour, style);
+ screen_write_start(&ctx, NULL, s);
+
+ t = time(NULL);
+ tm = localtime(&t);
+ if (style == 0) {
+ strftime(tim, sizeof tim, "%l:%M ", localtime(&t));
+ if (tm->tm_hour >= 12)
+ strlcat(tim, "PM", sizeof tim);
+ else
+ strlcat(tim, "AM", sizeof tim);
+ } else
+ strftime(tim, sizeof tim, "%H:%M", tm);
+
+ screen_write_clearscreen(&ctx);
+
+ if (screen_size_x(s) < 6 * strlen(tim) || screen_size_y(s) < 6) {
+ if (screen_size_x(s) >= strlen(tim) && screen_size_y(s) != 0) {
+ x = (screen_size_x(s) / 2) - (strlen(tim) / 2);
+ y = screen_size_y(s) / 2;
+ screen_write_cursormove(&ctx, x, y);
+
+ memcpy(&gc, &grid_default_cell, sizeof gc);
+ colour_set_fg(&gc, colour);
+ screen_write_puts(&ctx, &gc, "%s", tim);
+ }
+
+
+ screen_write_stop(&ctx);
+ return;
+ }
+
+ x = (screen_size_x(s) / 2) - 3 * strlen(tim);
+ y = (screen_size_y(s) / 2) - 3;
+
+ memcpy(&gc, &grid_default_cell, sizeof gc);
+ colour_set_bg(&gc, colour);
+ for (ptr = tim; *ptr != '\0'; ptr++) {
+ if (*ptr >= '0' && *ptr <= '9')
+ idx = *ptr - '0';
+ else if (*ptr == ':')
+ idx = 10;
+ else if (*ptr == 'A')
+ idx = 11;
+ else if (*ptr == 'P')
+ idx = 12;
+ else if (*ptr == 'M')
+ idx = 13;
+ else {
+ x += 6;
+ continue;
+ }
+
+ for (j = 0; j < 5; j++) {
+ for (i = 0; i < 5; i++) {
+ screen_write_cursormove(&ctx, x + i, y + j);
+ if (window_clock_table[idx][j][i])
+ screen_write_putc(&ctx, &gc, ' ');
+ }
+ }
+ x += 6;
+ }
+
screen_write_stop(&ctx);
}
commit 0bb9d51965f1920f303f8c9abd8133ce99d5818f
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Don't write into buffer if no arguments, reported by Filipe Rosset.
---
cmd.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cmd.c b/cmd.c
index 5e6b93a..a7a71a6 100644
--- a/cmd.c
+++ b/cmd.c
@@ -138,6 +138,9 @@ cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
size_t arglen;
int i;
+ if (argc == 0)
+ return (0);
+
*buf = '\0';
for (i = 0; i < argc; i++) {
if (strlcpy(buf, argv[i], len) >= len)
commit 6d9f936ff22e9488bec90e22338a5543fbeb25fc
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Change secondary device attributes response to \033[>84;0;0c which is unique
for tmux.
---
input.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/input.c b/input.c
index ce103bd..ee46c98 100644
--- a/input.c
+++ b/input.c
@@ -1147,7 +1147,7 @@ input_csi_dispatch(struct input_ctx *ictx)
case INPUT_CSI_DA_TWO:
switch (input_get(ictx, 0, 0, 0)) {
case 0:
- input_reply(ictx, "\033[>0;95;0c");
+ input_reply(ictx, "\033[>84;0;0c");
break;
default:
log_debug("%s: unknown '%c'", __func__, ictx->ch);
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
clock.c | 166 -------------------------------------------------------
cmd.c | 3 +
input.c | 2 +-
screen-redraw.c | 2 +-
tmux.h | 5 +-
window-clock.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
7 files changed, 147 insertions(+), 175 deletions(-)
delete mode 100644 clock.c
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
