Skip to content

fullscreen mode #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leorosa wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fullscreen mode #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deb4213
add a new fullscreen mode
leorosa Oct 1, 2021
c5b85a6
add a new focus change mode, considering a "screen order" instead of …
leorosa Oct 1, 2021
c07be0d
saner defaults...
leorosa Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config.def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
#define MOVE_RIGHT CODE(KEY_RIGHT)
#define MOVE_LEFT CODE(KEY_LEFT)
#define MOVE_OTHER KEY(L'o')
#define MOVE_BACKWARD KEY(L'[')
#define MOVE_FORWARD KEY(L']')

/* The split terminal keys. */
#define HSPLIT KEY(L'h')
Expand All @@ -54,6 +56,10 @@
/* The force redraw key. */
#define REDRAW KEY(L'l')

/* Toggle fullscreen. */
#define FULLSCREEN KEY(L'f')
#define START_IN_FULLSCREEN 0

/* The scrollback keys. */
#define SCROLLUP CODE(KEY_PPAGE)
#define SCROLLDOWN CODE(KEY_NPAGE)
Expand Down
63 changes: 49 additions & 14 deletions mtm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

/*** CONFIGURATION */
#include "config.h"
int isfullscreen = START_IN_FULLSCREEN;

#define MIN(x, y) ((x) < (y)? (x) : (y))
#define MAX(x, y) ((x) > (y)? (x) : (y))
Expand Down Expand Up @@ -832,6 +833,9 @@ focus(NODE *n) /* Focus a node. */
focus(n->c1? n->c1 : n->c2);
}

#define BACKWARD(n) ( n->p ? (n->p->c1 == n ? n->p->p : n->p->c1) : n )
#define FORWARD(n) ( n->p ? (n->p->c2 ? n->p->c2 : n->c2) : n )

#define ABOVE(n) n->y - 2, n->x + n->w / 2
#define BELOW(n) n->y + n->h + 2, n->x + n->w / 2
#define LEFT(n) n->y + n->h / 2, n->x - 2
Expand Down Expand Up @@ -919,14 +923,19 @@ reshapeview(NODE *n, int d, int ow) /* Reshape a view. */
static void
reshapechildren(NODE *n) /* Reshape all children of a view. */
{
if (n->t == HORIZONTAL){
int i = n->w % 2? 0 : 1;
reshape(n->c1, n->y, n->x, n->h, n->w / 2);
reshape(n->c2, n->y, n->x + n->w / 2 + 1, n->h, n->w / 2 - i);
} else if (n->t == VERTICAL){
int i = n->h % 2? 0 : 1;
reshape(n->c1, n->y, n->x, n->h / 2, n->w);
reshape(n->c2, n->y + n->h / 2 + 1, n->x, n->h / 2 - i, n->w);
if (isfullscreen) {
reshape(n->c1, 0, 0, LINES, COLS);
reshape(n->c2, 0, 0, LINES, COLS);
} else {
if (n->t == HORIZONTAL){
int i = n->w % 2? 0 : 1;
reshape(n->c1, n->y, n->x, n->h, n->w / 2);
reshape(n->c2, n->y, n->x + n->w / 2 + 1, n->h, n->w / 2 - i);
} else if (n->t == VERTICAL){
int i = n->h % 2? 0 : 1;
reshape(n->c1, n->y, n->x, n->h / 2, n->w);
reshape(n->c2, n->y + n->h / 2 + 1, n->x, n->h / 2 - i, n->w);
}
}
}

Expand All @@ -942,6 +951,10 @@ reshape(NODE *n, int y, int x, int h, int w) /* Reshape a node. */
n->x = x;
n->h = MAX(h, 1);
n->w = MAX(w, 1);
if (isfullscreen) {
n->h = LINES;
n->w = COLS;
}

if (n->t == VIEW)
reshapeview(n, d, ow);
Expand All @@ -954,20 +967,25 @@ static void
drawchildren(const NODE *n) /* Draw all children of n. */
{
draw(n->c1);
if (n->t == HORIZONTAL)
mvvline(n->y, n->x + n->w / 2, ACS_VLINE, n->h);
else
mvhline(n->y + n->h / 2, n->x, ACS_HLINE, n->w);
wnoutrefresh(stdscr);
if (!isfullscreen) {
if (n->t == HORIZONTAL)
mvvline(n->y, n->x + n->w / 2, ACS_VLINE, n->h);
else
mvhline(n->y + n->h / 2, n->x, ACS_HLINE, n->w);
wnoutrefresh(stdscr);
}
draw(n->c2);
}

static void
draw(NODE *n) /* Draw a node. */
{
if (n->t == VIEW)
if (n->t == VIEW) {
if (isfullscreen && n != focused)
return;
pnoutrefresh(n->s->win, n->s->off, 0, n->y, n->x,
n->y + n->h - 1, n->x + n->w - 1);
}
else
drawchildren(n);
}
Expand All @@ -977,6 +995,10 @@ split(NODE *n, Node t) /* Split a node. */
{
int nh = t == VERTICAL? (n->h - 1) / 2 : n->h;
int nw = t == HORIZONTAL? (n->w) / 2 : n->w;
if (isfullscreen) {
nh = LINES;
nw = COLS;
}
NODE *p = n->p;
NODE *v = newview(NULL, 0, 0, MAX(0, nh), MAX(0, nw));
if (!v)
Expand All @@ -993,6 +1015,12 @@ split(NODE *n, Node t) /* Split a node. */
draw(p? p : root);
}

static void
togglefullscreen() {
isfullscreen = !isfullscreen;
reshape(root, 0, 0, LINES, COLS);
}

static bool
getinput(NODE *n, fd_set *f) /* Recursively check all ptty's for input. */
{
Expand Down Expand Up @@ -1092,8 +1120,13 @@ handlechar(int r, int k) /* Handle a single input character. */
DO(true, MOVE_LEFT, focus(findnode(root, LEFT(n))))
DO(true, MOVE_RIGHT, focus(findnode(root, RIGHT(n))))
DO(true, MOVE_OTHER, focus(lastfocused))
DO(true, MOVE_BACKWARD, focus(BACKWARD(n)))
DO(true, MOVE_FORWARD, focus(FORWARD(n)))
DO(false, CODE(KEY_SLEFT), focus(BACKWARD(n)))
DO(false, CODE(KEY_SRIGHT), focus(FORWARD(n)))
DO(true, HSPLIT, split(n, HORIZONTAL))
DO(true, VSPLIT, split(n, VERTICAL))
DO(true, FULLSCREEN, togglefullscreen())
DO(true, DELETE_NODE, deletenode(n))
DO(true, REDRAW, touchwin(stdscr); draw(root); redrawwin(stdscr))
DO(true, SCROLLUP, scrollback(n))
Expand Down Expand Up @@ -1133,6 +1166,8 @@ run(void) /* Run MTM. */
int
main(int argc, char **argv)
{
if (!getenv("ESCDELAY"))
set_escdelay(100);
FD_SET(STDIN_FILENO, &fds);
setlocale(LC_ALL, "");
signal(SIGCHLD, SIG_IGN); /* automatically reap children */
Expand Down