Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am draw.c
Added Files:
piximg.c piximg.h
Log Message:
Split up, move some code around.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- Makefile.am 15 Jun 2007 20:33:10 -0000 1.87
+++ Makefile.am 23 Jun 2007 20:35:51 -0000 1.88
@@ -79,6 +79,7 @@
mwm.c \
pager.c \
parse.c parse.h \
+ piximg.c piximg.h \
progress.c progress.h \
regex.c \
screen.c screen.h \
===================================================================
RCS file: /cvs/e/e16/e/src/draw.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- draw.c 17 Jun 2007 21:20:46 -0000 1.105
+++ draw.c 23 Jun 2007 20:35:51 -0000 1.106
@@ -25,644 +25,100 @@
#include "eobj.h"
#include "ewins.h"
#include "hints.h"
+#include "piximg.h"
#include "xwin.h"
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-
-static void
-EFillPixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
-{
- XGCValues gcv;
- GC gc;
-
- gcv.subwindow_mode = IncludeInferiors;
- gc = EXCreateGC(win, GCSubwindowMode, &gcv);
- XCopyArea(disp, win, pmap, gc, x, y, w, h, x, y);
- EXFreeGC(gc);
-}
-
-static void
-EPastePixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
-{
- XGCValues gcv;
- GC gc;
-
- gcv.subwindow_mode = IncludeInferiors;
- gc = EXCreateGC(win, GCSubwindowMode, &gcv);
- XCopyArea(disp, pmap, win, gc, x, y, w, h, x, y);
- EXFreeGC(gc);
-}
-
-typedef struct _PixImg
-{
- XImage *xim;
- XShmSegmentInfo *shminfo;
- Pixmap pmap;
- GC gc;
-}
-PixImg;
-
-static PixImg *
-ECreatePixImg(Window win, int w, int h)
-{
- XGCValues gcv;
- PixImg *pi;
-
- pi = EMALLOC(PixImg, 1);
- if (!pi)
- return NULL;
-
- pi->shminfo = EMALLOC(XShmSegmentInfo, 1);
- if (pi->shminfo)
- {
- pi->xim = XShmCreateImage(disp, VRoot.vis, VRoot.depth, ZPixmap, NULL,
- pi->shminfo, w, h);
- if (pi->xim)
- {
- pi->shminfo->shmid =
- shmget(IPC_PRIVATE, pi->xim->bytes_per_line * pi->xim->height,
- IPC_CREAT | 0666);
- if (pi->shminfo->shmid >= 0)
- {
- pi->shminfo->shmaddr = pi->xim->data =
- (char *)shmat(pi->shminfo->shmid, 0, 0);
- if (pi->shminfo->shmaddr)
- {
- pi->shminfo->readOnly = False;
- XShmAttach(disp, pi->shminfo);
- pi->pmap =
- XShmCreatePixmap(disp, win, pi->shminfo->shmaddr,
- pi->shminfo, w, h, VRoot.depth);
- if (pi->pmap)
- {
- gcv.subwindow_mode = IncludeInferiors;
- pi->gc = EXCreateGC(win, GCSubwindowMode, &gcv);
- if (pi->gc)
- return pi;
-
- EFreePixmap(pi->pmap);
- }
- XShmDetach(disp, pi->shminfo);
- shmdt(pi->shminfo->shmaddr);
- }
- shmctl(pi->shminfo->shmid, IPC_RMID, 0);
- }
- XDestroyImage(pi->xim);
- }
- Efree(pi->shminfo);
- }
- Efree(pi);
- return NULL;
-}
-
-static void
-EDestroyPixImg(PixImg * pi)
-{
- if (!pi)
- return;
- ESync();
- XShmDetach(disp, pi->shminfo);
- shmdt(pi->shminfo->shmaddr);
- shmctl(pi->shminfo->shmid, IPC_RMID, 0);
- XDestroyImage(pi->xim);
- Efree(pi->shminfo);
- EFreePixmap(pi->pmap);
- EXFreeGC(pi->gc);
- Efree(pi);
-}
-
-static void
-EBlendRemoveShape(Win win, Pixmap pmap, int x, int y)
-{
- static GC gc = 0;
- Window root = VRoot.xwin;
- int w, h;
-
- if (!win)
- {
- if (gc)
- EXFreeGC(gc);
- gc = 0;
- return;
- }
-
- w = WinGetW(win);
- h = WinGetH(win);
-
- if (!gc)
- {
- XGCValues gcv;
- GC gcm;
- Pixmap mask;
- XRectangle *rl;
- int i;
-
- gcv.subwindow_mode = IncludeInferiors;
- gc = EXCreateGC(root, GCSubwindowMode, &gcv);
-
- mask = EXCreatePixmap(root, w, h, 1);
- gcm = EXCreateGC(mask, 0, NULL);
- XSetForeground(disp, gcm, 1);
- XFillRectangle(disp, mask, gcm, 0, 0, w, h);
- XSetForeground(disp, gcm, 0);
- rl = win->rects;
- for (i = 0; i < win->num_rect; i++)
- XFillRectangle(disp, mask, gcm, rl[i].x, rl[i].y, rl[i].width,
- rl[i].height);
- XSetClipMask(disp, gc, mask);
- EXFreeGC(gcm);
- EXFreePixmap(mask);
- }
-
- XSetClipOrigin(disp, gc, x, y);
- XCopyArea(disp, pmap, root, gc, x, y, w, h, x, y);
-}
-
-static void
-EBlendPixImg(Win win, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y,
- int w, int h)
-{
- static GC gc = 0;
- Window root = VRoot.xwin;
- int i, j, ox, oy;
-
- if (!win)
- {
- if (gc)
- EXFreeGC(gc);
- gc = 0;
- return;
- }
-
- if (!gc)
- {
- XGCValues gcv;
-
- gcv.subwindow_mode = IncludeInferiors;
- gc = EXCreateGC(root, GCSubwindowMode, &gcv);
- if (win->rects)
- XSetClipRectangles(disp, gc, x, y, win->rects, win->num_rect,
- win->ord);
- }
- else
- XSetClipOrigin(disp, gc, x, y);
-
- ox = 0;
- oy = 0;
- if ((x >= VRoot.w) || (y >= VRoot.h))
- return;
- if (x + w > VRoot.w)
- w -= ((x + w) - VRoot.w);
- if (x < 0)
- {
- ox = -x;
- w -= ox;
- x = 0;
- }
- if (y + h > VRoot.h)
- h -= ((y + h) - VRoot.h);
- if (y < 0)
- {
- oy = -y;
- h -= oy;
- y = 0;
- }
- if ((w <= 0) || (h <= 0))
- return;
-
- ESync();
-
- switch (dst->xim->bits_per_pixel)
- {
- case 32:
- for (j = 0; j < h; j++)
- {
- unsigned int *ptr1, *ptr2, *ptr3;
-
- ptr1 =
- (unsigned int *)(s1->xim->data +
- ((x) *
- ((s1->xim->bits_per_pixel) >> 3)) +
- ((j + y) * s1->xim->bytes_per_line));
- ptr2 =
- (unsigned int *)(s2->xim->data +
- ((ox) *
- ((s2->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * s2->xim->bytes_per_line));
- ptr3 =
- (unsigned int *)(dst->xim->data +
- ((ox) *
- ((dst->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * dst->xim->bytes_per_line));
- for (i = 0; i < w; i++)
- {
- unsigned int p1, p2;
-
- p1 = *ptr1++;
- p2 = *ptr2++;
- *ptr3++ =
- ((p1 >> 1) & 0x7f7f7f7f) +
- ((p2 >> 1) & 0x7f7f7f7f) + (p1 & p2 & 0x01010101);
- }
- }
- break;
- case 24:
- for (j = 0; j < h; j++)
- {
- for (i = 0; i < w; i++)
- {
- unsigned int p1, p2;
-
- p1 = XGetPixel(s1->xim, (i + x), (j + y));
- p2 = XGetPixel(s2->xim, (i + ox), (j + oy));
- XPutPixel(dst->xim, (i + ox), (j + oy),
- (((p1 >> 1) & 0x7f7f7f7f) +
- ((p2 >> 1) & 0x7f7f7f7f) +
- (p1 & p2 & 0x01010101)));
- }
- }
- break;
- case 16:
- if (DefaultDepth(disp, VRoot.scr) != 15)
- {
- for (j = 0; j < h; j++)
- {
- unsigned int *ptr1, *ptr2, *ptr3;
-
- ptr1 =
- (unsigned int *)(s1->xim->data +
- ((x) *
- ((s1->xim->bits_per_pixel) >> 3)) +
- ((j + y) * s1->xim->bytes_per_line));
- ptr2 =
- (unsigned int *)(s2->xim->data +
- ((ox) *
- ((s2->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * s2->xim->bytes_per_line));
- ptr3 =
- (unsigned int *)(dst->xim->data +
- ((ox) *
- ((dst->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * dst->xim->bytes_per_line));
- if (!(w & 0x1))
- {
- for (i = 0; i < w; i += 2)
- {
- unsigned int p1, p2;
-
- p1 = *ptr1++;
- p2 = *ptr2++;
- *ptr3++ =
- ((p1 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)
- | (0x78 << 24) | (0x7c << 19) | (0x78
- <<
- 13)))
- +
- ((p2 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)
- | (0x78 << 24) | (0x7c << 19) | (0x78
- <<
- 13)))
- +
- (p1 & p2 &
- ((0x1 << 11) | (0x1 << 5) | (0x1) |
- (0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
- }
- }
- else
- {
- for (i = 0; i < (w - 1); i += 2)
- {
- unsigned int p1, p2;
-
- p1 = *ptr1++;
- p2 = *ptr2++;
- *ptr3++ =
- ((p1 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)
- | (0x78 << 24) | (0x7c << 19) | (0x78
- <<
- 13)))
- +
- ((p2 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)
- | (0x78 << 24) | (0x7c << 19) | (0x78
- <<
- 13)))
- +
- (p1 & p2 &
- ((0x1 << 11) | (0x1 << 5) | (0x1) |
- (0x1 << 27) | (0x1 << 21) | (0x1 << 16)));
- }
- {
- unsigned short *pptr1, *pptr2, *pptr3;
- unsigned short pp1, pp2;
-
- pptr1 = (unsigned short *)ptr1;
- pptr2 = (unsigned short *)ptr2;
- pptr3 = (unsigned short *)ptr3;
- pp1 = *pptr1;
- pp2 = *pptr2;
- *pptr3 =
- ((pp1 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)))
- +
- ((pp2 >> 1) &
- ((0x78 << 8) | (0x7c << 3) | (0x78 >> 3)))
- + (pp1 & pp2 & ((0x1 << 11) | (0x1 << 5) | (0x1)));
- }
- }
- }
- }
- else
- {
- for (j = 0; j < h; j++)
- {
- unsigned int *ptr1, *ptr2, *ptr3;
-
- ptr1 =
- (unsigned int *)(s1->xim->data +
- ((x) *
- ((s1->xim->
- bits_per_pixel) >> 3)) + ((j +
- y) *
- s1->
- xim->
-
bytes_per_line));
- ptr2 =
- (unsigned int *)(s2->xim->data +
- ((ox) *
- ((s2->xim->
- bits_per_pixel) >> 3)) + ((j +
- oy)
- *
- s2->
- xim->
-
bytes_per_line));
- ptr3 =
- (unsigned int *)(dst->xim->data +
- ((ox) *
- ((dst->xim->
- bits_per_pixel) >> 3)) + ((j +
- oy)
- *
- dst->
- xim->
-
bytes_per_line));
- if (!(w & 0x1))
- {
- for (i = 0; i < w; i += 2)
- {
- unsigned int p1, p2;
-
- p1 = *ptr1++;
- p2 = *ptr2++;
- *ptr3++ =
- ((p1 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)
- | (0x78 << 23) | (0x78 << 18) | (0x78
- <<
- 13)))
- +
- ((p2 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)
- | (0x78 << 23) | (0x78 << 18) | (0x78
- <<
- 13)))
- +
- (p1 & p2 &
- ((0x1 << 10) | (0x1 << 5) | (0x1) |
- (0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
- }
- }
- else
- {
- for (i = 0; i < (w - 1); i += 2)
- {
- unsigned int p1, p2;
-
- p1 = *ptr1++;
- p2 = *ptr2++;
- *ptr3++ =
- ((p1 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)
- | (0x78 << 23) | (0x78 << 18) | (0x78
- <<
- 13)))
- +
- ((p2 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)
- | (0x78 << 23) | (0x78 << 18) | (0x78
- <<
- 13)))
- +
- (p1 & p2 &
- ((0x1 << 10) | (0x1 << 5) | (0x1) |
- (0x1 << 26) | (0x1 << 20) | (0x1 << 16)));
- }
- {
- unsigned short *pptr1, *pptr2, *pptr3;
- unsigned short pp1, pp2;
-
- pptr1 = (unsigned short *)ptr1;
- pptr2 = (unsigned short *)ptr2;
- pptr3 = (unsigned short *)ptr3;
- pp1 = *pptr1;
- pp2 = *pptr2;
- *pptr3++ =
- ((pp1 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)))
- +
- ((pp2 >> 1) &
- ((0x78 << 7) | (0x78 << 2) | (0x78 >> 3)))
- + (pp1 & pp2 & ((0x1 << 10) | (0x1 << 5) | (0x1)));
- }
- }
- }
- }
- break;
- default:
- for (j = 0; j < h; j++)
- {
- unsigned char *ptr1, *ptr2, *ptr3;
-
- ptr1 =
- (unsigned char *)(s1->xim->data +
- ((x) *
- ((s1->xim->bits_per_pixel) >> 3)) +
- ((j + y) * s1->xim->bytes_per_line));
- ptr2 =
- (unsigned char *)(s2->xim->data +
- ((ox) *
- ((s2->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * s2->xim->bytes_per_line));
- ptr3 =
- (unsigned char *)(dst->xim->data +
- ((ox) *
- ((dst->xim->bits_per_pixel) >> 3)) +
- ((j + oy) * dst->xim->bytes_per_line));
- if (!(w & 0x1))
- {
- if (j & 0x1)
- {
- ptr2++;
- for (i = 0; i < w; i += 2)
- {
- unsigned char p1;
-
- p1 = *ptr1;
- ptr1 += 2;
- *ptr3++ = p1;
- p1 = *ptr2;
- ptr2 += 2;
- *ptr3++ = p1;
- }
- }
- else
- {
- ptr1++;
- for (i = 0; i < w; i += 2)
- {
- unsigned char p1;
-
- p1 = *ptr2;
- ptr2 += 2;
- *ptr3++ = p1;
- p1 = *ptr1;
- ptr1 += 2;
- *ptr3++ = p1;
- }
- }
- }
- else
- {
- if (j & 0x1)
- {
- ptr2++;
- for (i = 0; i < (w - 1); i += 2)
- {
- unsigned char p1;
-
- p1 = *ptr1;
- ptr1 += 2;
- *ptr3++ = p1;
- p1 = *ptr2;
- ptr2 += 2;
- *ptr3++ = p1;
- }
- *ptr3 = *ptr1;
- }
- else
- {
- ptr1++;
- for (i = 0; i < (w - 1); i += 2)
- {
- unsigned char p1;
-
- p1 = *ptr2;
- ptr2 += 2;
- *ptr3++ = p1;
- p1 = *ptr1;
- ptr1 += 2;
- *ptr3++ = p1;
- }
- *ptr3 = *ptr2;
- }
- }
- }
- break;
- }
-/* workaround since XCopyArea doesnt always work with shared pixmaps */
- XShmPutImage(disp, root, gc, dst->xim, ox, oy, x, y, w, h, False);
-/* XCopyArea(disp, dst->pmap, root, gc, ox, oy, w, h, x, y); */
-/* I dont believe it - you cannot do this to a shared pixmaps to the screen */
-/* XCopyArea(disp, dst->pmap, root, dst->gc, x, y, w, h, x, y); */
-}
#include <X11/bitmaps/gray>
#include <X11/bitmaps/gray3>
#define DRAW_H_ARROW(_dr, _gc, x1, x2, y1) \
- if (((x2) - (x1)) >= 12) \
- { \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 6, (y1) - 3); \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 6, (y1) + 3); \
- XDrawLine(disp, _dr, _gc, (x2), (y1), (x2) - 6, (y1) - 3); \
- XDrawLine(disp, _dr, _gc, (x2), (y1), (x2) - 6, (y1) + 3); \
- } \
- if ((x2) >= (x1)) \
- { \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x2), (y1)); \
- Esnprintf(str, sizeof(str), "%i", (x2) - (x1) + 1); \
- XDrawString(disp, _dr, _gc, ((x1) + (x2)) / 2, (y1) - 10, str,
strlen(str)); \
- }
+ if (((x2) - (x1)) >= 12) \
+ { \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 6, (y1) - 3); \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 6, (y1) + 3); \
+ XDrawLine(disp, _dr, _gc, (x2), (y1), (x2) - 6, (y1) - 3); \
+ XDrawLine(disp, _dr, _gc, (x2), (y1), (x2) - 6, (y1) + 3); \
+ } \
+ if ((x2) >= (x1)) \
+ { \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x2), (y1)); \
+ Esnprintf(str, sizeof(str), "%i", (x2) - (x1) + 1); \
+ XDrawString(disp, _dr, _gc, ((x1) + (x2)) / 2, (y1) - 10, str,
strlen(str)); \
+ }
#define DRAW_V_ARROW(_dr, _gc, y1, y2, x1) \
- if (((y2) - (y1)) >= 12) \
- { \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 3, (y1) + 6); \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) - 3, (y1) + 6); \
- XDrawLine(disp, _dr, _gc, (x1), (y2), (x1) + 3, (y2) - 6); \
- XDrawLine(disp, _dr, _gc, (x1), (y2), (x1) - 3, (y2) - 6); \
- } \
- if ((y2) >= (y1)) \
- { \
- XDrawLine(disp, _dr, _gc, (x1), (y1), (x1), (y2)); \
- Esnprintf(str, sizeof(str), "%i", (y2) - (y1) + 1); \
- XDrawString(disp, _dr, _gc, (x1) + 10, ((y1) + (y2)) / 2, str,
strlen(str)); \
- }
+ if (((y2) - (y1)) >= 12) \
+ { \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) + 3, (y1) + 6); \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x1) - 3, (y1) + 6); \
+ XDrawLine(disp, _dr, _gc, (x1), (y2), (x1) + 3, (y2) - 6); \
+ XDrawLine(disp, _dr, _gc, (x1), (y2), (x1) - 3, (y2) - 6); \
+ } \
+ if ((y2) >= (y1)) \
+ { \
+ XDrawLine(disp, _dr, _gc, (x1), (y1), (x1), (y2)); \
+ Esnprintf(str, sizeof(str), "%i", (y2) - (y1) + 1); \
+ XDrawString(disp, _dr, _gc, (x1) + 10, ((y1) + (y2)) / 2, str,
strlen(str)); \
+ }
+
#define DO_DRAW_MODE_1(_dr, _gc, _a, _b, _c, _d) \
- if (!font) \
- font = XLoadFont(disp, "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"); \
- XSetFont(disp, _gc, font); \
- if (_c < 3) _c = 3; \
- if (_d < 3) _d = 3; \
- DRAW_H_ARROW(_dr, _gc, _a + bl, _a + bl + _c - 1, _b + bt + _d - 16); \
- DRAW_H_ARROW(_dr, _gc, 0, _a - 1, _b + bt + (_d / 2)); \
- DRAW_H_ARROW(_dr, _gc, _a + _c + bl + br, VRoot.w - 1, _b + bt + (_d /
2)); \
- DRAW_V_ARROW(_dr, _gc, _b + bt, _b + bt + _d - 1, _a + bl + 16); \
- DRAW_V_ARROW(_dr, _gc, 0, _b - 1, _a + bl + (_c / 2)); \
- DRAW_V_ARROW(_dr, _gc, _b + _d + bt + bb, VRoot.h - 1, _a + bl + (_c /
2)); \
- XDrawLine(disp, _dr, _gc, _a, 0, _a, VRoot.h); \
- XDrawLine(disp, _dr, _gc, _a + _c + bl + br - 1, 0, _a + _c + bl + br -
1, VRoot.h); \
- XDrawLine(disp, _dr, _gc, 0, _b, VRoot.w, _b); \
- XDrawLine(disp, _dr, _gc, 0, _b + _d + bt + bb - 1, VRoot.w, _b + _d +
bt + bb - 1); \
- XDrawRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d - 3);
+ do { \
+ if (!font) \
+ font = XLoadFont(disp, "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"); \
+ XSetFont(disp, _gc, font); \
+ if (_c < 3) _c = 3; \
+ if (_d < 3) _d = 3; \
+ DRAW_H_ARROW(_dr, _gc, _a + bl, _a + bl + _c - 1, _b + bt + _d - 16); \
+ DRAW_H_ARROW(_dr, _gc, 0, _a - 1, _b + bt + (_d / 2)); \
+ DRAW_H_ARROW(_dr, _gc, _a + _c + bl + br, VRoot.w - 1, _b + bt + (_d /
2)); \
+ DRAW_V_ARROW(_dr, _gc, _b + bt, _b + bt + _d - 1, _a + bl + 16); \
+ DRAW_V_ARROW(_dr, _gc, 0, _b - 1, _a + bl + (_c / 2)); \
+ DRAW_V_ARROW(_dr, _gc, _b + _d + bt + bb, VRoot.h - 1, _a + bl + (_c /
2)); \
+ XDrawLine(disp, _dr, _gc, _a, 0, _a, VRoot.h); \
+ XDrawLine(disp, _dr, _gc, _a + _c + bl + br - 1, 0, _a + _c + bl + br - 1,
VRoot.h); \
+ XDrawLine(disp, _dr, _gc, 0, _b, VRoot.w, _b); \
+ XDrawLine(disp, _dr, _gc, 0, _b + _d + bt + bb - 1, VRoot.w, _b + _d + bt
+ bb - 1); \
+ XDrawRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d - 3); \
+ } while(0)
#define DO_DRAW_MODE_2(_dr, _gc, _a, _b, _c, _d) \
- if (_c < 3) _c = 3; \
- if (_d < 3) _d = 3; \
- XDrawRectangle(disp, _dr, _gc, _a, _b, _c + bl + br - 1, _d + bt + bb -
1); \
- XDrawRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d - 3);
+ do { \
+ if (_c < 3) _c = 3; \
+ if (_d < 3) _d = 3; \
+ XDrawRectangle(disp, _dr, _gc, _a, _b, _c + bl + br - 1, _d + bt + bb -
1); \
+ XDrawRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d - 3); \
+ } while(0)
#define DO_DRAW_MODE_3(_dr, _gc, _a, _b, _c, _d) \
- XSetFillStyle(disp, _gc, FillStippled); \
- XSetStipple(disp, _gc, b2); \
- if ((_c + bl + br > 0) && (bt > 0)) \
- XFillRectangle(disp, _dr, _gc, _a, _b, _c + bl + br, bt); \
- if ((_c + bl + br > 0) && (bb > 0)) \
- XFillRectangle(disp, _dr, _gc, _a, _b + _d + bt, _c + bl + br, bb); \
- if ((_d > 0) && (bl > 0)) \
- XFillRectangle(disp, _dr, _gc, _a, _b + bt, bl, _d); \
- if ((_d > 0) && (br > 0)) \
- XFillRectangle(disp, _dr, _gc, _a + _c + bl, _b + bt, br, _d); \
- XSetStipple(disp, _gc, b3); \
- if ((_c > 0) && (_d > 0)) \
- XFillRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d -
3);
+ do { \
+ XSetFillStyle(disp, _gc, FillStippled); \
+ XSetStipple(disp, _gc, b2); \
+ if ((_c + bl + br > 0) && (bt > 0)) \
+ XFillRectangle(disp, _dr, _gc, _a, _b, _c + bl + br, bt); \
+ if ((_c + bl + br > 0) && (bb > 0)) \
+ XFillRectangle(disp, _dr, _gc, _a, _b + _d + bt, _c + bl + br, bb); \
+ if ((_d > 0) && (bl > 0)) \
+ XFillRectangle(disp, _dr, _gc, _a, _b + bt, bl, _d); \
+ if ((_d > 0) && (br > 0)) \
+ XFillRectangle(disp, _dr, _gc, _a + _c + bl, _b + bt, br, _d); \
+ XSetStipple(disp, _gc, b3); \
+ if ((_c > 0) && (_d > 0)) \
+ XFillRectangle(disp, _dr, _gc, _a + bl + 1, _b + bt + 1, _c - 3, _d -
3); \
+ } while(0)
#define DO_DRAW_MODE_4(_dr, _gc, _a, _b, _c, _d) \
- XSetFillStyle(disp, _gc, FillStippled); \
- XSetStipple(disp, _gc, b2); \
- XFillRectangle(disp, _dr, _gc, _a, _b, _c + bl + br, _d + bt + bb);
+ do { \
+ XSetFillStyle(disp, _gc, FillStippled); \
+ XSetStipple(disp, _gc, b2); \
+ XFillRectangle(disp, _dr, _gc, _a, _b, _c + bl + br, _d + bt + bb); \
+ } while(0)
#define _SHAPE_SET_RECT(rl, _x, _y, _w, _h) \
-do { \
+ do { \
rl[0].x = _x; rl[0].y = _y; rl[0].width = _w;
rl[0].height = 1; \
rl[1].x = _x; rl[1].y = _y + _h - 1; rl[1].width = _w;
rl[1].height = 1; \
rl[2].x = _x; rl[2].y = _y + 1; rl[2].width = 1;
rl[2].height = _h - 2; \
rl[3].x = _x + _w - 1; rl[3].y = _y + 1; rl[3].width = 1;
rl[3].height = _h - 2; \
-} while(0)
+ } while(0)
#define _R(x) (((x) >> 16) & 0xff)
#define _G(x) (((x) >> 8) & 0xff)
@@ -745,10 +201,10 @@
EwinOpMoveResize(ewin, OPSRC_USER, x, y, w, h);
EwinShapeSet(ewin);
CoordsShow(ewin);
- break;
+ goto done;
case 1:
case 2:
- goto do_non_opaque;
+ break;
case 3:
case 4:
if (!b2)
@@ -757,269 +213,254 @@
if (!b3)
b3 = XCreateBitmapFromData(disp, root, gray3_bits, gray3_width,
gray3_height);
- goto do_non_opaque;
+ break;
case 5:
- do_non_opaque:
- if (firstlast == 0)
- EwinShapeSet(ewin);
+ break;
+ }
- if ((Mode.mode == MODE_RESIZE) || (Mode.mode == MODE_RESIZE_H)
- || (Mode.mode == MODE_RESIZE_V))
- {
- i = (x - ewin->shape_x) / ewin->icccm.w_inc;
- j = (y - ewin->shape_y) / ewin->icccm.h_inc;
- x = ewin->shape_x + (i * ewin->icccm.w_inc);
- y = ewin->shape_y + (j * ewin->icccm.h_inc);
- }
+ if (firstlast == 0)
+ EwinShapeSet(ewin);
- dx = EoGetX(EoGetDesk(ewin));
- dy = EoGetY(EoGetDesk(ewin));
- x1 = ewin->shape_x + dx;
- y1 = ewin->shape_y + dy;
-
- w1 = ewin->shape_w;
- h1 = ewin->shape_h;
-
- ewin->shape_x = x;
- ewin->shape_y = y;
- x += dx;
- y += dy;
+ if ((Mode.mode == MODE_RESIZE) || (Mode.mode == MODE_RESIZE_H)
+ || (Mode.mode == MODE_RESIZE_V))
+ {
+ i = (x - ewin->shape_x) / ewin->icccm.w_inc;
+ j = (y - ewin->shape_y) / ewin->icccm.h_inc;
+ x = ewin->shape_x + (i * ewin->icccm.w_inc);
+ y = ewin->shape_y + (j * ewin->icccm.h_inc);
+ }
- if (!ewin->state.shaded)
- {
- ewin->shape_w = w;
- ewin->shape_h = h;
- }
- else
- {
- w = ewin->shape_w;
- h = ewin->shape_h;
- }
+ dx = EoGetX(EoGetDesk(ewin));
+ dy = EoGetY(EoGetDesk(ewin));
+ x1 = ewin->shape_x + dx;
+ y1 = ewin->shape_y + dy;
+
+ w1 = ewin->shape_w;
+ h1 = ewin->shape_h;
+
+ ewin->shape_x = x;
+ ewin->shape_y = y;
+ x += dx;
+ y += dy;
- EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
+ if (!ewin->state.shaded)
+ {
+ ewin->shape_w = w;
+ ewin->shape_h = h;
+ }
+ else
+ {
+ w = ewin->shape_w;
+ h = ewin->shape_h;
+ }
- if (!gc)
- {
- XGCValues gcv;
+ EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
- gcv.function = GXxor;
- gcv.foreground = WhitePixel(disp, VRoot.scr);
- if (gcv.foreground == 0)
- gcv.foreground = BlackPixel(disp, VRoot.scr);
- gcv.subwindow_mode = IncludeInferiors;
- gc = EXCreateGC(root,
- GCFunction | GCForeground | GCSubwindowMode, &gcv);
- }
+ if (md == 2 && !Conf.movres.old_mode)
+ {
+ static EObj *shape_win = NULL;
- if (md == 1)
- {
- if (firstlast > 0)
- {
- DO_DRAW_MODE_1(root, gc, x1, y1, w1, h1);
- }
- CoordsShow(ewin);
- if (firstlast < 2)
- {
- DO_DRAW_MODE_1(root, gc, x, y, w, h);
- }
- }
- else if (md == 2 && !Conf.movres.old_mode)
- {
- static EObj *shape_win = NULL;
+ if (firstlast == 0 && !shape_win)
+ shape_win = _ShapeCreateWin();
+ if (!shape_win)
+ return;
- if (firstlast == 0 && !shape_win)
- shape_win = _ShapeCreateWin();
- if (!shape_win)
- return;
-
- _ShapeSetBox(shape_win, x, y, w, h, bl, br, bt, bb, seqno);
- EobjMap(shape_win, 0);
-
- CoordsShow(ewin);
- if (firstlast == 2)
- {
- EobjDestroy(shape_win);
- shape_win = NULL;
- }
- }
- else if (md == 2)
- {
- if (firstlast > 0)
- {
- DO_DRAW_MODE_2(root, gc, x1, y1, w1, h1);
- }
- CoordsShow(ewin);
- if (firstlast < 2)
- {
- DO_DRAW_MODE_2(root, gc, x, y, w, h);
- }
- }
- else if (md == 3)
- {
- if (firstlast > 0)
- {
- DO_DRAW_MODE_3(root, gc, x1, y1, w1, h1);
- }
- CoordsShow(ewin);
- if (firstlast < 2)
- {
- DO_DRAW_MODE_3(root, gc, x, y, w, h);
- }
- }
- else if (md == 4)
- {
- if (firstlast > 0)
- {
- DO_DRAW_MODE_4(root, gc, x1, y1, w1, h1);
- }
- CoordsShow(ewin);
- if (firstlast < 2)
- {
- DO_DRAW_MODE_4(root, gc, x, y, w, h);
- }
- }
- else if (md == 5)
- {
- static PixImg *ewin_pi = NULL;
- static PixImg *root_pi = NULL;
- static PixImg *draw_pi = NULL;
-
- if (firstlast == 0)
- {
- XGCValues gcv2;
- GC gc2;
-
- if (ewin_pi)
- EDestroyPixImg(ewin_pi);
- if (root_pi)
- EDestroyPixImg(root_pi);
- if (draw_pi)
- EDestroyPixImg(draw_pi);
- EBlendRemoveShape(NULL, 0, 0, 0);
- EBlendPixImg(NULL, NULL, NULL, NULL, 0, 0, 0, 0);
- root_pi = ECreatePixImg(root, VRoot.w, VRoot.h);
- ewin_pi = ECreatePixImg(root, EoGetW(ewin), EoGetH(ewin));
- draw_pi = ECreatePixImg(root, EoGetW(ewin), EoGetH(ewin));
- if ((!root_pi) || (!ewin_pi) || (!draw_pi))
- {
- Conf.movres.mode_move = 0;
- EUngrabServer();
- DrawEwinShape(ewin, Conf.movres.mode_move, x, y, w, h,
- firstlast, seqno);
- return;
- }
- EFillPixmap(root, root_pi->pmap, x1, y1, EoGetW(ewin),
- EoGetH(ewin));
- gc2 = EXCreateGC(root_pi->pmap, 0, &gcv2);
- XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc2, x1, y1,
- EoGetW(ewin), EoGetH(ewin), 0, 0);
- EXFreeGC(gc2);
- EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi, x, y,
- EoGetW(ewin), EoGetH(ewin));
- }
- else if (firstlast == 1)
- {
- int wt, ht;
- int adx, ady;
-
- dx = x - x1;
- dy = y - y1;
- if (dx < 0)
- adx = -dx;
- else
- adx = dx;
- if (dy < 0)
- ady = -dy;
- else
- ady = dy;
- wt = EoGetW(ewin);
- ht = EoGetH(ewin);
- if ((adx <= wt) && (ady <= ht))
- {
- if (dx < 0)
- EFillPixmap(root, root_pi->pmap, x, y, -dx, ht);
- else if (dx > 0)
- EFillPixmap(root, root_pi->pmap, x + wt - dx, y,
- dx, ht);
- if (dy < 0)
- EFillPixmap(root, root_pi->pmap, x, y, wt, -dy);
- else if (dy > 0)
- EFillPixmap(root, root_pi->pmap, x, y + ht - dy,
- wt, dy);
- }
- else
- EFillPixmap(root, root_pi->pmap, x, y, wt, ht);
- if ((adx <= wt) && (ady <= ht))
- {
- EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi,
- x, y, EoGetW(ewin), EoGetH(ewin));
- if (dx > 0)
- EPastePixmap(root, root_pi->pmap, x1, y1, dx, ht);
- else if (dx < 0)
- EPastePixmap(root, root_pi->pmap, x1 + wt + dx,
- y1, -dx, ht);
- if (dy > 0)
- EPastePixmap(root, root_pi->pmap, x1, y1, wt, dy);
- else if (dy < 0)
- EPastePixmap(root, root_pi->pmap, x1,
- y1 + ht + dy, wt, -dy);
- }
- else
- {
- EPastePixmap(root, root_pi->pmap, x1, y1, wt, ht);
- EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi,
- x, y, EoGetW(ewin), EoGetH(ewin));
- }
- EBlendRemoveShape(EoGetWin(ewin), root_pi->pmap, x, y);
- }
- else if (firstlast == 2)
- {
- EPastePixmap(root, root_pi->pmap, x1, y1, EoGetW(ewin),
- EoGetH(ewin));
- if (ewin_pi)
- EDestroyPixImg(ewin_pi);
- if (root_pi)
- EDestroyPixImg(root_pi);
- if (draw_pi)
- EDestroyPixImg(draw_pi);
- EBlendRemoveShape(NULL, 0, 0, 0);
- EBlendPixImg(NULL, NULL, NULL, NULL, 0, 0, 0, 0);
- ewin_pi = NULL;
- root_pi = NULL;
- draw_pi = NULL;
- }
- else if (firstlast == 3)
- {
- EPastePixmap(root, root_pi->pmap, x, y, EoGetW(ewin),
- EoGetH(ewin));
- if (root_pi)
- EDestroyPixImg(root_pi);
- root_pi = NULL;
- }
- else if (firstlast == 4)
- {
- int wt, ht;
-
- wt = EoGetW(ewin);
- ht = EoGetH(ewin);
- root_pi = ECreatePixImg(root, VRoot.w, VRoot.h);
- EFillPixmap(root, root_pi->pmap, x, y, wt, ht);
- EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi, x, y,
- EoGetW(ewin), EoGetH(ewin));
- }
- CoordsShow(ewin);
- }
+ _ShapeSetBox(shape_win, x, y, w, h, bl, br, bt, bb, seqno);
+ EobjMap(shape_win, 0);
+ CoordsShow(ewin);
if (firstlast == 2)
{
- EXFreeGC(gc);
- gc = 0;
+ EobjDestroy(shape_win);
+ shape_win = NULL;
}
+ goto done;
+ }
+
+ if (!gc)
+ {
+ XGCValues gcv;
+
+ gcv.function = GXxor;
+ gcv.foreground = WhitePixel(disp, VRoot.scr);
+ if (gcv.foreground == 0)
+ gcv.foreground = BlackPixel(disp, VRoot.scr);
+ gcv.subwindow_mode = IncludeInferiors;
+ gc = EXCreateGC(root,
+ GCFunction | GCForeground | GCSubwindowMode, &gcv);
+ }
+
+ switch (md)
+ {
+ case 1:
+ if (firstlast > 0)
+ DO_DRAW_MODE_1(root, gc, x1, y1, w1, h1);
+ CoordsShow(ewin);
+ if (firstlast < 2)
+ DO_DRAW_MODE_1(root, gc, x, y, w, h);
+ break;
+ case 2:
+ if (firstlast > 0)
+ DO_DRAW_MODE_2(root, gc, x1, y1, w1, h1);
+ CoordsShow(ewin);
+ if (firstlast < 2)
+ DO_DRAW_MODE_2(root, gc, x, y, w, h);
break;
- default:
+ case 3:
+ if (firstlast > 0)
+ DO_DRAW_MODE_3(root, gc, x1, y1, w1, h1);
+ CoordsShow(ewin);
+ if (firstlast < 2)
+ DO_DRAW_MODE_3(root, gc, x, y, w, h);
+ break;
+ case 4:
+ if (firstlast > 0)
+ DO_DRAW_MODE_4(root, gc, x1, y1, w1, h1);
+ CoordsShow(ewin);
+ if (firstlast < 2)
+ DO_DRAW_MODE_4(root, gc, x, y, w, h);
+ break;
+ case 5:
+ {
+ static PixImg *ewin_pi = NULL;
+ static PixImg *root_pi = NULL;
+ static PixImg *draw_pi = NULL;
+
+ if (firstlast == 0)
+ {
+ XGCValues gcv2;
+ GC gc2;
+
+ if (ewin_pi)
+ EDestroyPixImg(ewin_pi);
+ if (root_pi)
+ EDestroyPixImg(root_pi);
+ if (draw_pi)
+ EDestroyPixImg(draw_pi);
+ EBlendRemoveShape(NULL, 0, 0, 0);
+ EBlendPixImg(NULL, NULL, NULL, NULL, 0, 0, 0, 0);
+ root_pi = ECreatePixImg(root, VRoot.w, VRoot.h);
+ ewin_pi = ECreatePixImg(root, EoGetW(ewin), EoGetH(ewin));
+ draw_pi = ECreatePixImg(root, EoGetW(ewin), EoGetH(ewin));
+ if ((!root_pi) || (!ewin_pi) || (!draw_pi))
+ {
+ Conf.movres.mode_move = 0;
+ EUngrabServer();
+ DrawEwinShape(ewin, Conf.movres.mode_move, x, y, w, h,
+ firstlast, seqno);
+ return;
+ }
+ EFillPixmap(root, root_pi->pmap, x1, y1, EoGetW(ewin),
+ EoGetH(ewin));
+ gc2 = EXCreateGC(root_pi->pmap, 0, &gcv2);
+ XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc2, x1, y1,
+ EoGetW(ewin), EoGetH(ewin), 0, 0);
+ EXFreeGC(gc2);
+ EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi, x, y,
+ EoGetW(ewin), EoGetH(ewin));
+ }
+ else if (firstlast == 1)
+ {
+ int wt, ht;
+ int adx, ady;
+
+ dx = x - x1;
+ dy = y - y1;
+ if (dx < 0)
+ adx = -dx;
+ else
+ adx = dx;
+ if (dy < 0)
+ ady = -dy;
+ else
+ ady = dy;
+ wt = EoGetW(ewin);
+ ht = EoGetH(ewin);
+ if ((adx <= wt) && (ady <= ht))
+ {
+ if (dx < 0)
+ EFillPixmap(root, root_pi->pmap, x, y, -dx, ht);
+ else if (dx > 0)
+ EFillPixmap(root, root_pi->pmap, x + wt - dx, y,
+ dx, ht);
+ if (dy < 0)
+ EFillPixmap(root, root_pi->pmap, x, y, wt, -dy);
+ else if (dy > 0)
+ EFillPixmap(root, root_pi->pmap, x, y + ht - dy,
+ wt, dy);
+ }
+ else
+ EFillPixmap(root, root_pi->pmap, x, y, wt, ht);
+ if ((adx <= wt) && (ady <= ht))
+ {
+ EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi,
+ x, y, EoGetW(ewin), EoGetH(ewin));
+ if (dx > 0)
+ EPastePixmap(root, root_pi->pmap, x1, y1, dx, ht);
+ else if (dx < 0)
+ EPastePixmap(root, root_pi->pmap, x1 + wt + dx,
+ y1, -dx, ht);
+ if (dy > 0)
+ EPastePixmap(root, root_pi->pmap, x1, y1, wt, dy);
+ else if (dy < 0)
+ EPastePixmap(root, root_pi->pmap, x1,
+ y1 + ht + dy, wt, -dy);
+ }
+ else
+ {
+ EPastePixmap(root, root_pi->pmap, x1, y1, wt, ht);
+ EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi,
+ x, y, EoGetW(ewin), EoGetH(ewin));
+ }
+ EBlendRemoveShape(EoGetWin(ewin), root_pi->pmap, x, y);
+ }
+ else if (firstlast == 2)
+ {
+ EPastePixmap(root, root_pi->pmap, x1, y1, EoGetW(ewin),
+ EoGetH(ewin));
+ if (ewin_pi)
+ EDestroyPixImg(ewin_pi);
+ if (root_pi)
+ EDestroyPixImg(root_pi);
+ if (draw_pi)
+ EDestroyPixImg(draw_pi);
+ EBlendRemoveShape(NULL, 0, 0, 0);
+ EBlendPixImg(NULL, NULL, NULL, NULL, 0, 0, 0, 0);
+ ewin_pi = NULL;
+ root_pi = NULL;
+ draw_pi = NULL;
+ }
+ else if (firstlast == 3)
+ {
+ EPastePixmap(root, root_pi->pmap, x, y, EoGetW(ewin),
+ EoGetH(ewin));
+ if (root_pi)
+ EDestroyPixImg(root_pi);
+ root_pi = NULL;
+ }
+ else if (firstlast == 4)
+ {
+ int wt, ht;
+
+ wt = EoGetW(ewin);
+ ht = EoGetH(ewin);
+ root_pi = ECreatePixImg(root, VRoot.w, VRoot.h);
+ EFillPixmap(root, root_pi->pmap, x, y, wt, ht);
+ EBlendPixImg(EoGetWin(ewin), root_pi, ewin_pi, draw_pi, x, y,
+ EoGetW(ewin), EoGetH(ewin));
+ }
+ CoordsShow(ewin);
+ }
break;
}
+ if (firstlast == 2)
+ {
+ EXFreeGC(gc);
+ gc = 0;
+ }
+
+ done:
if (firstlast == 0 || firstlast == 2 || firstlast == 4)
{
ewin->req_x = ewin->shape_x;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
