mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 12:58: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:
@@ -51,6 +51,7 @@
|
||||
|
||||
#include <wraster.h>
|
||||
|
||||
#include <WINGs/WINGsP.h>
|
||||
|
||||
#include "WindowMaker.h"
|
||||
#include "wcore.h"
|
||||
@@ -2989,11 +2990,11 @@ setHightlightText(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
|
||||
static int
|
||||
setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index)
|
||||
{
|
||||
if (scr->clip_title_pixel[index]!=scr->white_pixel &&
|
||||
scr->clip_title_pixel[index]!=scr->black_pixel) {
|
||||
wFreeColor(scr, scr->clip_title_pixel[index]);
|
||||
}
|
||||
scr->clip_title_pixel[index] = color->pixel;
|
||||
if (scr->clip_title_color[index])
|
||||
WMReleaseColor(scr->clip_title_color[index]);
|
||||
scr->clip_title_color[index] = WMCreateRGBColor(scr->wmscreen, color->red,
|
||||
color->green, color->blue,
|
||||
True);
|
||||
|
||||
#ifdef GRADIENT_CLIP_ARROW
|
||||
if (index == CLIP_NORMAL) {
|
||||
@@ -3115,7 +3116,11 @@ setMenuDisabledColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *fo
|
||||
static int
|
||||
setIconTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
|
||||
{
|
||||
XSetForeground(dpy, scr->icon_title_gc, color->pixel);
|
||||
if (scr->icon_title_color)
|
||||
WMReleaseColor(scr->icon_title_color);
|
||||
scr->icon_title_color = WMCreateRGBColor(scr->wmscreen, color->red,
|
||||
color->green, color->blue,
|
||||
True);
|
||||
|
||||
return REFRESH_ICON_TITLE_COLOR;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user