aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fbi.c161
-rw-r--r--fbtools.c74
-rw-r--r--fbtools.h14
-rw-r--r--gfx.h1
4 files changed, 118 insertions, 132 deletions
diff --git a/fbi.c b/fbi.c
index e9054c1..6281f6e 100644
--- a/fbi.c
+++ b/fbi.c
@@ -21,6 +21,9 @@
#include <wchar.h>
#include <sys/time.h>
#include <sys/ioctl.h>
+
+#include <linux/kd.h>
+#include <linux/vt.h>
#include <linux/fb.h>
#include <jpeglib.h>
@@ -121,11 +124,11 @@ static int img_mem, max_mem_mb;
/* graphics interface */
gfxstate *gfx;
+int debug;
/* framebuffer */
char *fbdev = NULL;
char *fbmode = NULL;
-int switch_last, debug;
unsigned short red[256], green[256], blue[256];
struct fb_cmap cmap = { 0, 256, red, green, blue };
@@ -195,6 +198,101 @@ usage(char *name)
"\n");
}
+/* -------------------------------------------------------------------- */
+
+#define CONSOLE_ACTIVE 0
+#define CONSOLE_REL_REQ 1
+#define CONSOLE_INACTIVE 2
+#define CONSOLE_ACQ_REQ 3
+
+static int switch_last;
+static int console_switch_state = CONSOLE_ACTIVE;
+static struct vt_mode vt_mode;
+
+static void console_switch_signal(int signal)
+{
+ if (signal == SIGUSR1) {
+ /* release */
+ console_switch_state = CONSOLE_REL_REQ;
+ if (debug)
+ write(2,"vt: SIGUSR1\n",12);
+ }
+ if (signal == SIGUSR2) {
+ /* acquisition */
+ console_switch_state = CONSOLE_ACQ_REQ;
+ if (debug)
+ write(2,"vt: SIGUSR2\n",12);
+ }
+}
+
+static void console_switch_release(void)
+{
+ ioctl(gfx->tty_fd, VT_RELDISP, 1);
+ console_switch_state = CONSOLE_INACTIVE;
+ if (debug)
+ write(2,"vt: release\n",12);
+}
+
+static void console_switch_acquire(void)
+{
+ ioctl(gfx->tty_fd, VT_RELDISP, VT_ACKACQ);
+ console_switch_state = CONSOLE_ACTIVE;
+ if (debug)
+ write(2,"vt: acquire\n",12);
+}
+
+static int console_switch_init(void)
+{
+ struct sigaction act,old;
+
+ memset(&act,0,sizeof(act));
+ act.sa_handler = console_switch_signal;
+ sigemptyset(&act.sa_mask);
+ sigaction(SIGUSR1,&act,&old);
+ sigaction(SIGUSR2,&act,&old);
+
+ if (-1 == ioctl(gfx->tty_fd, VT_GETMODE, &vt_mode)) {
+ perror("ioctl VT_GETMODE");
+ exit(1);
+ }
+ vt_mode.mode = VT_PROCESS;
+ vt_mode.waitv = 0;
+ vt_mode.relsig = SIGUSR1;
+ vt_mode.acqsig = SIGUSR2;
+
+ if (-1 == ioctl(gfx->tty_fd, VT_SETMODE, &vt_mode)) {
+ perror("ioctl VT_SETMODE");
+ exit(1);
+ }
+ return 0;
+}
+
+static int check_console_switch(void)
+{
+ if (switch_last == console_switch_state)
+ return 0;
+
+ switch (console_switch_state) {
+ case CONSOLE_REL_REQ:
+ console_switch_release();
+ case CONSOLE_INACTIVE:
+ visible = 0;
+ break;
+ case CONSOLE_ACQ_REQ:
+ console_switch_acquire();
+ case CONSOLE_ACTIVE:
+ visible = 1;
+ gfx->restore_display();
+ shadow_set_dirty();
+ shadow_render(gfx);
+ break;
+ default:
+ break;
+ }
+ switch_last = console_switch_state;
+ return 1;
+}
+
/* ---------------------------------------------------------------------- */
static int flist_add(char *filename)
@@ -603,30 +701,6 @@ static void debug_key(char *key)
status_update(linebuffer, NULL);
}
-static void
-console_switch(void)
-{
- switch (fb_switch_state) {
- case FB_REL_REQ:
- fb_switch_release();
- case FB_INACTIVE:
- visible = 0;
- break;
- case FB_ACQ_REQ:
- fb_switch_acquire();
- case FB_ACTIVE:
- visible = 1;
- gfx->restore_display();
- shadow_set_dirty();
- shadow_render(gfx);
- break;
- default:
- break;
- }
- switch_last = fb_switch_state;
- return;
-}
-
/* ---------------------------------------------------------------------- */
static void free_image(struct ida_image *img)
@@ -708,8 +782,7 @@ read_image(char *filename)
img->data = flist_malloc(img->i.width * img->i.height * 3);
img_mem += img->i.width * img->i.height * 3;
for (y = 0; y < img->i.height; y++) {
- if (switch_last != fb_switch_state)
- console_switch();
+ check_console_switch();
loader->read(img->data + img->i.width * 3 * y, y, data);
}
loader->done(data);
@@ -742,8 +815,7 @@ scale_image(struct ida_image *src, float scale)
dest->data = flist_malloc(dest->i.width * dest->i.height * 3);
img_mem += dest->i.width * dest->i.height * 3;
for (y = 0; y < dest->i.height; y++) {
- if (switch_last != fb_switch_state)
- console_switch();
+ check_console_switch();
desc_resize.work(src,&rect,
dest->data + 3 * dest->i.width * y,
y, data);
@@ -874,8 +946,7 @@ svga_show(struct flist *f, struct flist *prev,
shadow_render(gfx);
}
}
- if (switch_last != fb_switch_state) {
- console_switch();
+ if (check_console_switch()) {
continue;
}
FD_ZERO(&set);
@@ -891,8 +962,7 @@ svga_show(struct flist *f, struct flist *prev,
limit.tv_usec = 0;
rc = select(fdmax, &set, NULL, NULL,
(0 != timeout && !paused) ? &limit : NULL);
- if (switch_last != fb_switch_state) {
- console_switch();
+ if (check_console_switch()) {
continue;
}
if (0 == rc)
@@ -1157,8 +1227,7 @@ static char edit_line(struct ida_image *img, char *line, int max)
FD_SET(0, &set);
rc = select(1, &set, NULL, NULL, NULL);
- if (switch_last != fb_switch_state) {
- console_switch();
+ if (check_console_switch()) {
continue;
}
rc = read(0, key, sizeof(key)-1);
@@ -1398,15 +1467,6 @@ static void flist_img_load(struct flist *f, int prefetch)
/* ---------------------------------------------------------------------- */
-static void cleanup_and_exit(int code)
-{
- shadow_fini();
- tty_restore();
- gfx->cleanup_display();
- flist_print_tagged(stdout);
- exit(code);
-}
-
static jmp_buf fb_fatal_cleanup;
static void catch_exit_signal(int signal)
@@ -1442,6 +1502,17 @@ static void exit_signals_init(void)
exit(42);
}
+/* ---------------------------------------------------------------------- */
+
+static void cleanup_and_exit(int code)
+{
+ shadow_fini();
+ tty_restore();
+ gfx->cleanup_display();
+ flist_print_tagged(stdout);
+ exit(code);
+}
+
int
main(int argc, char *argv[])
{
@@ -1529,7 +1600,7 @@ main(int argc, char *argv[])
cfg_get_str(O_VIDEO_MODE),
GET_VT());
exit_signals_init();
- fb_switch_init();
+ console_switch_init();
shadow_init(gfx);
signal(SIGTSTP,SIG_IGN);
diff --git a/fbtools.c b/fbtools.c
index 1518711..08ac41f 100644
--- a/fbtools.c
+++ b/fbtools.c
@@ -32,11 +32,6 @@ static const char *strsignal(int signr)
#endif
/* -------------------------------------------------------------------- */
-/* exported stuff */
-
-int fb_switch_state = FB_ACTIVE;
-
-/* -------------------------------------------------------------------- */
/* internal variables */
static struct fb_fix_screeninfo fb_fix;
@@ -47,7 +42,6 @@ static int fb_mem_offset = 0;
static int fb,tty;
static int orig_vt_no = 0;
-static struct vt_mode vt_mode;
static int kd_mode;
static struct vt_mode vt_omode;
@@ -118,73 +112,6 @@ static void fb_set_palette(void)
}
/* -------------------------------------------------------------------- */
-/* console switching */
-
-extern int debug;
-
-static void
-fb_switch_signal(int signal)
-{
- if (signal == SIGUSR1) {
- /* release */
- fb_switch_state = FB_REL_REQ;
- if (debug)
- write(2,"vt: SIGUSR1\n",12);
- }
- if (signal == SIGUSR2) {
- /* acquisition */
- fb_switch_state = FB_ACQ_REQ;
- if (debug)
- write(2,"vt: SIGUSR2\n",12);
- }
-}
-
-void
-fb_switch_release()
-{
- ioctl(tty, VT_RELDISP, 1);
- fb_switch_state = FB_INACTIVE;
- if (debug)
- write(2,"vt: release\n",12);
-}
-
-void
-fb_switch_acquire()
-{
- ioctl(tty, VT_RELDISP, VT_ACKACQ);
- fb_switch_state = FB_ACTIVE;
- if (debug)
- write(2,"vt: acquire\n",12);
-}
-
-int
-fb_switch_init()
-{
- struct sigaction act,old;
-
- memset(&act,0,sizeof(act));
- act.sa_handler = fb_switch_signal;
- sigemptyset(&act.sa_mask);
- sigaction(SIGUSR1,&act,&old);
- sigaction(SIGUSR2,&act,&old);
-
- if (-1 == ioctl(tty,VT_GETMODE, &vt_mode)) {
- perror("ioctl VT_GETMODE");
- exit(1);
- }
- vt_mode.mode = VT_PROCESS;
- vt_mode.waitv = 0;
- vt_mode.relsig = SIGUSR1;
- vt_mode.acqsig = SIGUSR2;
-
- if (-1 == ioctl(tty,VT_SETMODE, &vt_mode)) {
- perror("ioctl VT_SETMODE");
- exit(1);
- }
- return 0;
-}
-
-/* -------------------------------------------------------------------- */
/* initialisation & cleanup */
static void
@@ -534,6 +461,7 @@ gfxstate* fb_init(char *device, char *mode, int vt)
gfx->cleanup_display = fb_cleanup_display;
gfx->fb_fd = fb;
+ gfx->tty_fd = tty;
return gfx;
err:
diff --git a/fbtools.h b/fbtools.h
index 4f14f6f..8b8156a 100644
--- a/fbtools.h
+++ b/fbtools.h
@@ -1,17 +1,3 @@
#include "gfx.h"
-#define FB_ACTIVE 0
-#define FB_REL_REQ 1
-#define FB_INACTIVE 2
-#define FB_ACQ_REQ 3
-
-/* info about videomode - yes I know, quick & dirty... */
-extern int fb_switch_state;
-
-/* init + cleanup */
gfxstate *fb_init(char *device, char *mode, int vt);
-
-/* console switching */
-int fb_switch_init(void);
-void fb_switch_release(void);
-void fb_switch_acquire(void);
diff --git a/gfx.h b/gfx.h
index a64b1e8..2ee61a8 100644
--- a/gfx.h
+++ b/gfx.h
@@ -18,5 +18,6 @@ struct gfxstate {
void (*cleanup_display)(void);
/* FIXME: legacy */
+ int tty_fd;
int fb_fd;
};
generated by cgit (git 2.34.1) at 2024-11-01 05:19:54 +0000