1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00

- API change in WINGs for WMDraw*String().

WMDrawString() and WMDrawImageString() now take WMColor instead of GC as
  arguments. WMDrawImageString() receives 2 colors (text & background).
  This is to allow easy extension for Xft/Xrender and hide X low level details
- Added alpha channel to WMColor. 2 new functions also:
  WMCreateRGBAColor() and WMSetColorAlpha()
- Miscelaneous code cleanups in wtext.c
- Removed obsoleted acconfig.h and implemented its functionality using
  AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends.
  This will definitely enforce the need to use autoconf 2.5x
This commit is contained in:
dan
2002-10-08 08:26:06 +00:00
parent e98da5a628
commit a2b404b5b3
58 changed files with 554 additions and 601 deletions

View File

@@ -9,7 +9,8 @@ typedef struct W_GeometryView {
W_Class widgetClass;
WMView *view;
GC gc;
WMColor *black;
WMColor *gray;
WMFont *font;
WMSize textSize;
@@ -67,20 +68,8 @@ WCreateGeometryView(WMScreen *scr)
return NULL;
}
{
WMColor *black = WMBlackColor(scr);
WMColor *gray = WMGrayColor(scr);
XGCValues gcv;
gcv.foreground = WMColorPixel(black);
gcv.background = WMColorPixel(gray);
gview->gc = XCreateGC(WMScreenDisplay(scr), W_DRAWABLE(scr),
GCForeground|GCBackground, &gcv);
WMReleaseColor(black);
WMReleaseColor(gray);
}
gview->black = WMBlackColor(scr);
gview->gray = WMGrayColor(scr);
WMCreateEventHandler(gview->view, ExposureMask, handleEvents, gview);
@@ -136,7 +125,7 @@ paint(WGeometryView *gview)
WMDrawImageString(W_VIEW_SCREEN(gview->view),
W_VIEW_DRAWABLE(gview->view),
gview->gc, gview->font,
gview->black, gview->gray, gview->font,
(W_VIEW_WIDTH(gview->view)-gview->textSize.width)/2,
(W_VIEW_HEIGHT(gview->view)-gview->textSize.height)/2,
buffer, strlen(buffer));