mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
linux: oshide becomes xenv for broader use
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@932 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
10250ad230
commit
10ef62e381
5 changed files with 119 additions and 101 deletions
|
|
@ -1,3 +0,0 @@
|
|||
int oshide_init(void);
|
||||
void oshide_finish(void);
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* (C) Gražvydas "notaz" Ignotas, 2009-2010
|
||||
* (C) Gražvydas "notaz" Ignotas, 2009-2011
|
||||
*
|
||||
* This work is licensed under the terms of any of these licenses
|
||||
* (at your option):
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
#include <dlfcn.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/XKBlib.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
#include <termios.h>
|
||||
#include <linux/kd.h>
|
||||
|
||||
#define PFX "oshide: "
|
||||
#define PFX "xenv: "
|
||||
|
||||
#define FPTR(f) typeof(f) * p##f
|
||||
#define FPTR_LINK(xf, dl, f) { \
|
||||
|
|
@ -35,25 +36,30 @@
|
|||
} \
|
||||
}
|
||||
|
||||
struct xfuncs {
|
||||
FPTR(XCreateBitmapFromData);
|
||||
FPTR(XCreatePixmapCursor);
|
||||
FPTR(XFreePixmap);
|
||||
FPTR(XOpenDisplay);
|
||||
FPTR(XDisplayName);
|
||||
FPTR(XCloseDisplay);
|
||||
FPTR(XCreateSimpleWindow);
|
||||
FPTR(XChangeWindowAttributes);
|
||||
FPTR(XSelectInput);
|
||||
FPTR(XMapWindow);
|
||||
FPTR(XNextEvent);
|
||||
FPTR(XCheckTypedEvent);
|
||||
FPTR(XUnmapWindow);
|
||||
FPTR(XGrabKeyboard);
|
||||
struct xstuff {
|
||||
Display *display;
|
||||
FPTR(XCreateBitmapFromData);
|
||||
FPTR(XCreatePixmapCursor);
|
||||
FPTR(XFreePixmap);
|
||||
FPTR(XOpenDisplay);
|
||||
FPTR(XDisplayName);
|
||||
FPTR(XCloseDisplay);
|
||||
FPTR(XCreateSimpleWindow);
|
||||
FPTR(XChangeWindowAttributes);
|
||||
FPTR(XSelectInput);
|
||||
FPTR(XMapWindow);
|
||||
FPTR(XNextEvent);
|
||||
FPTR(XCheckTypedEvent);
|
||||
FPTR(XUnmapWindow);
|
||||
FPTR(XGrabKeyboard);
|
||||
FPTR(XPending);
|
||||
FPTR(XLookupKeysym);
|
||||
FPTR(XkbSetDetectableAutoRepeat);
|
||||
};
|
||||
|
||||
static struct xstuff g_xstuff;
|
||||
|
||||
static Cursor transparent_cursor(struct xfuncs *xf, Display *display, Window win)
|
||||
static Cursor transparent_cursor(struct xstuff *xf, Display *display, Window win)
|
||||
{
|
||||
Cursor cursor;
|
||||
Pixmap pix;
|
||||
|
|
@ -68,46 +74,47 @@ static Cursor transparent_cursor(struct xfuncs *xf, Display *display, Window win
|
|||
return cursor;
|
||||
}
|
||||
|
||||
static void *x11h_handler(void *arg)
|
||||
static int x11h_init(void)
|
||||
{
|
||||
struct xfuncs xf;
|
||||
unsigned int display_width, display_height;
|
||||
Display *display;
|
||||
XSetWindowAttributes attributes;
|
||||
Window win;
|
||||
XEvent report;
|
||||
Display *display;
|
||||
Visual *visual;
|
||||
void *x11lib;
|
||||
int screen;
|
||||
|
||||
memset(&xf, 0, sizeof(xf));
|
||||
memset(&g_xstuff, 0, sizeof(g_xstuff));
|
||||
x11lib = dlopen("libX11.so.6", RTLD_LAZY);
|
||||
if (x11lib == NULL) {
|
||||
fprintf(stderr, "libX11.so load failed:\n%s\n", dlerror());
|
||||
goto fail;
|
||||
}
|
||||
FPTR_LINK(xf, x11lib, XCreateBitmapFromData);
|
||||
FPTR_LINK(xf, x11lib, XCreatePixmapCursor);
|
||||
FPTR_LINK(xf, x11lib, XFreePixmap);
|
||||
FPTR_LINK(xf, x11lib, XOpenDisplay);
|
||||
FPTR_LINK(xf, x11lib, XDisplayName);
|
||||
FPTR_LINK(xf, x11lib, XCloseDisplay);
|
||||
FPTR_LINK(xf, x11lib, XCreateSimpleWindow);
|
||||
FPTR_LINK(xf, x11lib, XChangeWindowAttributes);
|
||||
FPTR_LINK(xf, x11lib, XSelectInput);
|
||||
FPTR_LINK(xf, x11lib, XMapWindow);
|
||||
FPTR_LINK(xf, x11lib, XNextEvent);
|
||||
FPTR_LINK(xf, x11lib, XCheckTypedEvent);
|
||||
FPTR_LINK(xf, x11lib, XUnmapWindow);
|
||||
FPTR_LINK(xf, x11lib, XGrabKeyboard);
|
||||
FPTR_LINK(g_xstuff, x11lib, XCreateBitmapFromData);
|
||||
FPTR_LINK(g_xstuff, x11lib, XCreatePixmapCursor);
|
||||
FPTR_LINK(g_xstuff, x11lib, XFreePixmap);
|
||||
FPTR_LINK(g_xstuff, x11lib, XOpenDisplay);
|
||||
FPTR_LINK(g_xstuff, x11lib, XDisplayName);
|
||||
FPTR_LINK(g_xstuff, x11lib, XCloseDisplay);
|
||||
FPTR_LINK(g_xstuff, x11lib, XCreateSimpleWindow);
|
||||
FPTR_LINK(g_xstuff, x11lib, XChangeWindowAttributes);
|
||||
FPTR_LINK(g_xstuff, x11lib, XSelectInput);
|
||||
FPTR_LINK(g_xstuff, x11lib, XMapWindow);
|
||||
FPTR_LINK(g_xstuff, x11lib, XNextEvent);
|
||||
FPTR_LINK(g_xstuff, x11lib, XCheckTypedEvent);
|
||||
FPTR_LINK(g_xstuff, x11lib, XUnmapWindow);
|
||||
FPTR_LINK(g_xstuff, x11lib, XGrabKeyboard);
|
||||
FPTR_LINK(g_xstuff, x11lib, XPending);
|
||||
FPTR_LINK(g_xstuff, x11lib, XLookupKeysym);
|
||||
FPTR_LINK(g_xstuff, x11lib, XkbSetDetectableAutoRepeat);
|
||||
|
||||
//XInitThreads();
|
||||
|
||||
display = xf.pXOpenDisplay(NULL);
|
||||
g_xstuff.display = display = g_xstuff.pXOpenDisplay(NULL);
|
||||
if (display == NULL)
|
||||
{
|
||||
fprintf(stderr, "cannot connect to X server %s, X handling disabled.\n",
|
||||
xf.pXDisplayName(NULL));
|
||||
g_xstuff.pXDisplayName(NULL));
|
||||
goto fail2;
|
||||
}
|
||||
|
||||
|
|
@ -125,57 +132,63 @@ static void *x11h_handler(void *arg)
|
|||
display_height = DisplayHeight(display, screen);
|
||||
printf(PFX "display is %dx%d\n", display_width, display_height);
|
||||
|
||||
win = xf.pXCreateSimpleWindow(display,
|
||||
win = g_xstuff.pXCreateSimpleWindow(display,
|
||||
RootWindow(display, screen),
|
||||
0, 0, display_width, display_height, 0,
|
||||
BlackPixel(display, screen),
|
||||
BlackPixel(display, screen));
|
||||
|
||||
attributes.override_redirect = True;
|
||||
attributes.cursor = transparent_cursor(&xf, display, win);
|
||||
xf.pXChangeWindowAttributes(display, win, CWOverrideRedirect | CWCursor, &attributes);
|
||||
attributes.cursor = transparent_cursor(&g_xstuff, display, win);
|
||||
g_xstuff.pXChangeWindowAttributes(display, win, CWOverrideRedirect | CWCursor, &attributes);
|
||||
|
||||
xf.pXSelectInput(display, win, ExposureMask | FocusChangeMask | KeyPressMask | KeyReleaseMask);
|
||||
xf.pXMapWindow(display, win);
|
||||
xf.pXGrabKeyboard(display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
|
||||
g_xstuff.pXSelectInput(display, win, ExposureMask | FocusChangeMask | KeyPressMask | KeyReleaseMask);
|
||||
g_xstuff.pXMapWindow(display, win);
|
||||
g_xstuff.pXGrabKeyboard(display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
|
||||
g_xstuff.pXkbSetDetectableAutoRepeat(display, 1, NULL);
|
||||
// XSetIOErrorHandler
|
||||
|
||||
while (1)
|
||||
{
|
||||
xf.pXNextEvent(display, &report);
|
||||
switch (report.type)
|
||||
{
|
||||
case Expose:
|
||||
while (xf.pXCheckTypedEvent(display, Expose, &report))
|
||||
;
|
||||
break;
|
||||
|
||||
case FocusOut:
|
||||
// XFocusChangeEvent
|
||||
// printf("focus out\n");
|
||||
// xf.pXUnmapWindow(display, win);
|
||||
break;
|
||||
|
||||
case KeyPress:
|
||||
// printf("press %d\n", report.xkey.keycode);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
fail2:
|
||||
dlclose(x11lib);
|
||||
fail:
|
||||
g_xstuff.display = NULL;
|
||||
fprintf(stderr, "x11 handling disabled.\n");
|
||||
return NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int x11h_update(int *is_down)
|
||||
{
|
||||
XEvent evt;
|
||||
|
||||
while (g_xstuff.pXPending(g_xstuff.display))
|
||||
{
|
||||
g_xstuff.pXNextEvent(g_xstuff.display, &evt);
|
||||
switch (evt.type)
|
||||
{
|
||||
case Expose:
|
||||
while (g_xstuff.pXCheckTypedEvent(g_xstuff.display, Expose, &evt))
|
||||
;
|
||||
break;
|
||||
|
||||
case KeyPress:
|
||||
*is_down = 1;
|
||||
return g_xstuff.pXLookupKeysym(&evt.xkey, 0);
|
||||
|
||||
case KeyRelease:
|
||||
*is_down = 0;
|
||||
return g_xstuff.pXLookupKeysym(&evt.xkey, 0);
|
||||
// printf("press %d\n", evt.xkey.keycode);
|
||||
}
|
||||
}
|
||||
|
||||
return NoSymbol;
|
||||
}
|
||||
|
||||
static struct termios g_kbd_termios_saved;
|
||||
static int g_kbdfd;
|
||||
|
||||
static void hidecon_start(void)
|
||||
static int tty_init(void)
|
||||
{
|
||||
struct termios kbd_termios;
|
||||
int mode;
|
||||
|
|
@ -183,7 +196,7 @@ static void hidecon_start(void)
|
|||
g_kbdfd = open("/dev/tty", O_RDWR);
|
||||
if (g_kbdfd == -1) {
|
||||
perror(PFX "open /dev/tty");
|
||||
return;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (ioctl(g_kbdfd, KDGETMODE, &mode) == -1) {
|
||||
|
|
@ -213,14 +226,15 @@ static void hidecon_start(void)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
return;
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
close(g_kbdfd);
|
||||
g_kbdfd = -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void hidecon_end(void)
|
||||
static void tty_end(void)
|
||||
{
|
||||
if (g_kbdfd < 0)
|
||||
return;
|
||||
|
|
@ -235,34 +249,33 @@ static void hidecon_end(void)
|
|||
g_kbdfd = -1;
|
||||
}
|
||||
|
||||
int oshide_init(void)
|
||||
int xenv_init(void)
|
||||
{
|
||||
pthread_t tid;
|
||||
int ret;
|
||||
|
||||
ret = pthread_create(&tid, NULL, x11h_handler, NULL);
|
||||
if (ret != 0) {
|
||||
fprintf(stderr, PFX "failed to create thread: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
pthread_detach(tid);
|
||||
|
||||
hidecon_start();
|
||||
|
||||
ret = x11h_init();
|
||||
if (ret == 0)
|
||||
return 0;
|
||||
|
||||
ret = tty_init();
|
||||
if (ret == 0)
|
||||
return 0;
|
||||
|
||||
fprintf(stderr, PFX "error: both x11h_init and tty_init failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
void oshide_finish(void)
|
||||
int xenv_update(int *is_down)
|
||||
{
|
||||
/* XXX: the X thread.. */
|
||||
if (g_xstuff.display)
|
||||
return x11h_update(is_down);
|
||||
|
||||
hidecon_end();
|
||||
// TODO: read tty?
|
||||
return -1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
int main()
|
||||
void xenv_finish(void)
|
||||
{
|
||||
x11h_init();
|
||||
sleep(5);
|
||||
// TODO: cleanup X?
|
||||
tty_end();
|
||||
}
|
||||
#endif
|
||||
5
platform/linux/xenv.h
Normal file
5
platform/linux/xenv.h
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
int xenv_init(void);
|
||||
int xenv_update(int *is_down);
|
||||
void xenv_finish(void);
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.
|
|||
platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \
|
||||
platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
|
||||
platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
|
||||
platform/linux/plat.o platform/linux/oshide.o
|
||||
platform/linux/plat.o platform/linux/xenv.o
|
||||
|
||||
# ARM stuff
|
||||
OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "../common/input.h"
|
||||
#include "../linux/sndout_oss.h"
|
||||
#include "../linux/fbdev.h"
|
||||
#include "../linux/xenv.h"
|
||||
#include "plat.h"
|
||||
#include "asm_utils.h"
|
||||
#include "version.h"
|
||||
|
|
@ -169,6 +170,10 @@ void pemu_finalize_frame(const char *fps, const char *notice)
|
|||
void plat_video_flip(void)
|
||||
{
|
||||
g_screen_ptr = vout_fbdev_flip(layer_fb);
|
||||
|
||||
// XXX: drain OS event queue here, maybe we'll actually use it someday..
|
||||
int dummy;
|
||||
xenv_update(&dummy);
|
||||
}
|
||||
|
||||
void plat_video_toggle_renderer(int change, int is_menu)
|
||||
|
|
@ -542,8 +547,6 @@ void plat_wait_till_us(unsigned int us_to)
|
|||
*/
|
||||
}
|
||||
|
||||
#include "../linux/oshide.h"
|
||||
|
||||
void plat_early_init(void)
|
||||
{
|
||||
}
|
||||
|
|
@ -576,7 +579,7 @@ void plat_init(void)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
oshide_init();
|
||||
xenv_init();
|
||||
|
||||
w = h = 0;
|
||||
main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);
|
||||
|
|
@ -629,7 +632,7 @@ void plat_finish(void)
|
|||
{
|
||||
sndout_oss_exit();
|
||||
vout_fbdev_finish(main_fb);
|
||||
oshide_finish();
|
||||
xenv_finish();
|
||||
|
||||
printf("all done\n");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue