uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

X11 multiple display now tested

Browse source
This commit is contained in:
inmarket 2013-10-12 23:36:27 +10:00
parent 75ed684275
commit 769766aa4a
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/multiple/X/gdisp_lld.c
View file

@ -53,7 +53,6 @@ static int scr;
static XEvent evt; static XEvent evt;
static Colormap cmap; static Colormap cmap;
static XVisualInfo vis; static XVisualInfo vis;
static int depth;
static XContext cxt; static XContext cxt;
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
coord_t mousex, mousey; coord_t mousex, mousey;
@ -77,7 +76,7 @@ static void ProcessEvent(GDisplay *g, xPriv *priv) {
exit(0); exit(0);
break; break;
case Expose: case Expose:
XCopyArea(dis, pix, evt.xexpose.window, priv->gc, XCopyArea(dis, priv->pix, evt.xexpose.window, priv->gc,
evt.xexpose.x, evt.xexpose.y, evt.xexpose.x, evt.xexpose.y,
evt.xexpose.width, evt.xexpose.height, evt.xexpose.width, evt.xexpose.height,
evt.xexpose.x, evt.xexpose.y); evt.xexpose.x, evt.xexpose.y);
@ -130,7 +129,7 @@ static DECLARE_THREAD_FUNCTION(ThreadX, arg) {
gfxSleepMilliseconds(100); gfxSleepMilliseconds(100);
while(XPending(dis)) { while(XPending(dis)) {
XNextEvent(dis, &evt); XNextEvent(dis, &evt);
XFindContext(ev.xany.display, ev.xany.window, cxt, (XPointer*)&g); XFindContext(evt.xany.display, evt.xany.window, cxt, (XPointer*)&g);
ProcessEvent(g, (xPriv *)g->priv); ProcessEvent(g, (xPriv *)g->priv);
} }
} }
@ -204,15 +203,15 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g, unsigned display) {
CWBackPixel|CWColormap|CWBorderPixel, &xa); CWBackPixel|CWColormap|CWBorderPixel, &xa);
XSync(dis, TRUE); XSync(dis, TRUE);
XSaveContext(dis, win, cxt, (XPointer)g); XSaveContext(dis, priv->win, cxt, (XPointer)g);
{ {
char buf[132]; char buf[132];
sprintf(buf, "uGFX - %u", display+1); sprintf(buf, "uGFX - %u", display+1);
WindowTitleText = buf; WindowTitleText = buf;
XStringListToTextProperty(&WindowTitleText, 1, &WindowTitle); XStringListToTextProperty(&WindowTitleText, 1, &WindowTitle);
XSetWMName(dis, win, &WindowTitle); XSetWMName(dis, priv->win, &WindowTitle);
XSetWMIconName(dis, win, &WindowTitle); XSetWMIconName(dis, priv->win, &WindowTitle);
XSync(dis, TRUE); XSync(dis, TRUE);
} }
@ -220,20 +219,20 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g, unsigned display) {
pSH->flags = PSize | PMinSize | PMaxSize; pSH->flags = PSize | PMinSize | PMaxSize;
pSH->min_width = pSH->max_width = pSH->base_width = GDISP_SCREEN_WIDTH; pSH->min_width = pSH->max_width = pSH->base_width = GDISP_SCREEN_WIDTH;
pSH->min_height = pSH->max_height = pSH->base_height = GDISP_SCREEN_HEIGHT; pSH->min_height = pSH->max_height = pSH->base_height = GDISP_SCREEN_HEIGHT;
XSetWMNormalHints(dis, win, pSH); XSetWMNormalHints(dis, priv->win, pSH);
XFree(pSH); XFree(pSH);
XSync(dis, TRUE); XSync(dis, TRUE);
priv->pix = XCreatePixmap(dis, win, priv->pix = XCreatePixmap(dis, priv->win,
GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT, vis.depth); GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT, vis.depth);
XSync(dis, TRUE); XSync(dis, TRUE);
priv->gc = XCreateGC(dis, win, 0, 0); priv->gc = XCreateGC(dis, priv->win, 0, 0);
XSetBackground(dis, gc, BlackPixel(dis, scr)); XSetBackground(dis, priv->gc, BlackPixel(dis, scr));
XSync(dis, TRUE); XSync(dis, TRUE);
XSelectInput(dis, win, StructureNotifyMask); XSelectInput(dis, priv->win, StructureNotifyMask);
XMapWindow(dis, win); XMapWindow(dis, priv->win);
// Wait for the window creation to complete (for safety) // Wait for the window creation to complete (for safety)
while(!(((volatile GDisplay *)g)->flags & GDISP_FLG_READY)) while(!(((volatile GDisplay *)g)->flags & GDISP_FLG_READY))
@ -249,9 +248,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g, unsigned display) {
return TRUE; return TRUE;
} }
LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g) LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g)
{ {
xPriv priv = (xPriv *)g->priv; xPriv * priv = (xPriv *)g->priv;
XColor col; XColor col;
col.red = RED_OF(g->p.color) << 8; col.red = RED_OF(g->p.color) << 8;
@ -265,8 +264,8 @@ LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g)
} }
#if GDISP_HARDWARE_FILLS #if GDISP_HARDWARE_FILLS
LLDSPEC void gdisp_lld_fill_area(GDISPDriver *g) { LLDSPEC void gdisp_lld_fill_area(GDisplay *g) {
xPriv priv = (xPriv *)g->priv; xPriv * priv = (xPriv *)g->priv;
XColor col; XColor col;
col.red = RED_OF(g->p.color) << 8; col.red = RED_OF(g->p.color) << 8;
@ -281,7 +280,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g)
#endif #endif
#if 0 && GDISP_HARDWARE_BITFILLS #if 0 && GDISP_HARDWARE_BITFILLS
LLDSPEC void gdisp_lld_blit_area(GDISPDriver *g) { LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
// Start of Bitblit code // Start of Bitblit code
//XImage bitmap; //XImage bitmap;
@ -294,8 +293,8 @@ LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g)
#endif #endif
#if GDISP_HARDWARE_PIXELREAD #if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDISPDriver *g) { LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
xPriv priv = (xPriv *)g->priv; xPriv * priv = (xPriv *)g->priv;
XColor color; XColor color;
XImage *img; XImage *img;
@ -308,8 +307,8 @@ LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g)
#endif #endif
#if GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL #if GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL
LLDSPEC void gdisp_lld_vertical_scroll(GDISPDriver *g) { LLDSPEC void gdisp_lld_vertical_scroll(GDisplay *g) {
xPriv priv = (xPriv *)g->priv; xPriv * priv = (xPriv *)g->priv;
if (g->p.y1 > 0) { if (g->p.y1 > 0) {
XCopyArea(dis, priv->pix, priv->pix, priv->gc, g->p.x, g->p.y+g->p.y1, g->p.cx, g->p.cy-g->p.y1, g->p.x, g->p.y); XCopyArea(dis, priv->pix, priv->pix, priv->gc, g->p.x, g->p.y+g->p.y1, g->p.cx, g->p.cy-g->p.y1, g->p.x, g->p.y);