diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2019-10-23 21:11:43 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:13:24 +0100 |
commit | cbc9f831cb2165a16075987c2c8698e58e9f7090 (patch) | |
tree | f51d3753a073074f8bea7747bd98ecf6e0b27883 /nx-X11/programs/Xserver/hw/nxagent/Holder.c | |
parent | 7b63809aefde4b45684a71d0a60e0c00b287837a (diff) | |
download | nx-libs-cbc9f831cb2165a16075987c2c8698e58e9f7090.tar.gz nx-libs-cbc9f831cb2165a16075987c2c8698e58e9f7090.tar.bz2 nx-libs-cbc9f831cb2165a16075987c2c8698e58e9f7090.zip |
Drop unused placeholder code
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Holder.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Holder.c | 151 |
1 files changed, 0 insertions, 151 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c index c27f67818..dd2756c92 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c @@ -26,40 +26,6 @@ #include <signal.h> #include <stdio.h> -#ifdef _XSERVER64 - -#include "scrnintstr.h" -#include "Agent.h" -#define GC XlibGC -#define Pixmap XlibPixmap -#define PIXEL_ALREADY_TYPEDEFED - -#endif /* _XSERVER64 */ - -#include "pixmapstr.h" -#include "regionstr.h" -#include "resource.h" -#include "../../include/gc.h" -#include "../../include/window.h" - -#include "X11/include/xpm_nxagent.h" - -#include "Agent.h" -#include "Pixmaps.h" -#include "Display.h" -#include "Holder.h" -#include "Icons.h" - -#include NXAGENT_PLACEHOLDER_NAME - -#define MAXDEPTH 32 - -#define PLACEHOLDER_WIDTH 14 -#define PLACEHOLDER_HEIGHT 16 - -#define PLACEHOLDER_BORDER_COLOR_DARK 0x000000 -#define PLACEHOLDER_BORDER_COLOR_LIGHT 0xB2B2B2 - /* * Set here the required log level. */ @@ -70,123 +36,6 @@ #undef DEBUG #undef DUMP -static Pixmap nxagentPlaceholderPixmaps[MAXDEPTH + 1]; - -void nxagentMarkPlaceholderNotLoaded(int depth) -{ - nxagentPlaceholderPixmaps[depth] = 0; -} - -void nxagentInitPlaceholder(int depth) -{ - int status; - XpmAttributes attributes; - - attributes.valuemask = XpmDepth | XpmSize; - attributes.depth = depth; - - status = XpmCreatePixmapFromData(nxagentDisplay, DefaultRootWindow(nxagentDisplay), - placeholderXpm, nxagentPlaceholderPixmaps + depth, NULL, &attributes); - - if (status != Success) - { - FatalError("Error: Failed to create the placeholder pixmap.\n"); - } - - #ifdef TEST - fprintf(stderr, "nxagentInitPlaceholder: Created pixmap [0x%lx] with geometry [%d,%d] for depth [%d].\n", - nxagentPlaceholderPixmaps[depth], attributes.width, attributes.height, depth); - #endif -} - -void nxagentApplyPlaceholder(Drawable drawable, int x, int y, - int w, int h, int depth) -{ - /* - * Instead of the image, a white rectangle that - * covers the pixmap area is drawn, alongside - * with a black and grey line that outlines the - * boundaries of the affected area. - */ - - GC gc; - XGCValues value; - XPoint points[3]; - - value.foreground = 0xffffffff; - value.background = 0x00000000; - value.plane_mask = 0xffffffff; - value.fill_style = FillSolid; - - /* - * FIXME: Should we use a gc cache to save - * some bandwidth? - */ - - gc = XCreateGC(nxagentDisplay, drawable, GCBackground | - GCForeground | GCFillStyle | GCPlaneMask, &value); - - XFillRectangle(nxagentDisplay, drawable, gc, x, y, w, h); - - if (depth == 1) - { - return; - } - - value.foreground = PLACEHOLDER_BORDER_COLOR_DARK; - value.line_style = LineSolid; - value.line_width = 1; - - points[0].x = x; - points[0].y = y + h - 1; - points[1].x = x; - points[1].y = y; - points[2].x = x + w - 1; - points[2].y = y; - - XChangeGC(nxagentDisplay, gc, GCForeground | GCLineWidth | GCLineStyle, &value); - XDrawLines(nxagentDisplay, drawable, gc, points, 3, CoordModeOrigin); - - value.foreground = PLACEHOLDER_BORDER_COLOR_LIGHT; - value.line_style = LineSolid; - value.line_width = 1; - - points[0].x = x; - points[0].y = y + h - 1; - points[1].x = x + w - 1; - points[1].y = y + h - 1; - points[2].x = x + w - 1; - points[2].y = y; - - XChangeGC(nxagentDisplay, gc, GCForeground | GCLineWidth | GCLineStyle, &value); - XDrawLines(nxagentDisplay, drawable, gc, points, 3, CoordModeOrigin); - - /* - * We are going to apply place holder only if on region - * we have enough space for the placeholder plus three - * pixel for spacing and one for region border. - */ - - if ((w >= PLACEHOLDER_WIDTH + 8) && (h >= PLACEHOLDER_HEIGHT + 8)) - { - #ifdef TEST - fprintf(stderr, "nxagentApplyPlaceholder: drawable %lx placeholder %lx from %d %d pixmap size is %d %d " - "depth %d\n", drawable, nxagentPlaceholderPixmaps[depth], x, y, w, h, depth); - #endif - - if (nxagentPlaceholderPixmaps[depth] == 0) - { - nxagentInitPlaceholder(depth); - } - - XCopyArea(nxagentDisplay, nxagentPlaceholderPixmaps[depth], - drawable, gc, 0, 0, PLACEHOLDER_WIDTH, PLACEHOLDER_HEIGHT, x + 4, y + 4); - - } - - XFreeGC(nxagentDisplay, gc); -} - #ifdef DUMP static char hexdigit(char c) |