scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ fixed screen vs. screen-number 

+ added: XftFontSetCreate(), XftFontSetAdd(), XftColorAllocName(), XftColorFree()
This commit is contained in:
eknauel 2003-10-17 06:31:06 +00:00
parent 14b26869a8
commit 43515aeda1
1 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
c/libs/xft.c
View File

@ -130,13 +130,13 @@ s48_value scx_XftPatternAdd(s48_value sxp, s48_value sobj,
return rv ? S48_TRUE : S48_FALSE; return rv ? S48_TRUE : S48_FALSE;
} }
s48_value scx_XftFontMatch(s48_value sdpy, s48_value sscreen, s48_value sxp) s48_value scx_XftFontMatch(s48_value sdpy, s48_value sscreenno, s48_value sxp)
{ {
XftPattern *p; XftPattern *p;
XftResult r; XftResult r;
p = XftFontMatch((Display *) scx_extract_display(sdpy), p = XftFontMatch((Display *) scx_extract_display(sdpy),
s48_extract_integer(sscreen), s48_extract_integer(sscreenno),
scx_extract_xftpattern(sxp), scx_extract_xftpattern(sxp),
&r); &r);
@ -152,20 +152,20 @@ s48_value scx_XftFontOpenPattern(s48_value sdpy, s48_value sxp)
scx_extract_xftpattern(sxp))); scx_extract_xftpattern(sxp)));
} }
s48_value scx_XftFontOpenName(s48_value sdpy, s48_value sscreen, s48_value sname) s48_value scx_XftFontOpenName(s48_value sdpy, s48_value sscreenno, s48_value sname)
{ {
XftFont *xf; XftFont *xf;
xf = XftFontOpenName(scx_extract_display(sdpy), s48_extract_integer(sscreen), xf = XftFontOpenName(scx_extract_display(sdpy), s48_extract_integer(sscreenno),
s48_extract_string(sname)); s48_extract_string(sname));
return scx_enter_xftfont(xf); return scx_enter_xftfont(xf);
} }
s48_value scx_XftFontOpenXlfd(s48_value sdpy, s48_value sscreen, s48_value sxlfd) s48_value scx_XftFontOpenXlfd(s48_value sdpy, s48_value sscreenno, s48_value sxlfd)
{ {
XftFont *xf; XftFont *xf;
xf = XftFontOpenXlfd(scx_extract_display(sdpy), s48_extract_integer(sscreen), xf = XftFontOpenXlfd(scx_extract_display(sdpy), s48_extract_integer(sscreenno),
s48_extract_string(sxlfd)); s48_extract_string(sxlfd));
return scx_enter_xftfont(xf); return scx_enter_xftfont(xf);
} }
@ -312,19 +312,67 @@ s48_value scx_XftObjectSetAdd(s48_value sxo, s48_value sobj)
return b ? S48_TRUE : S48_FALSE; return b ? S48_TRUE : S48_FALSE;
} }
s48_value scx_XftListFontsPatternObjects(s48_value sdpy, s48_value sscreen, s48_value scx_XftListFontsPatternObjects(s48_value sdpy, s48_value sscreenno,
s48_value sxp, s48_value sxo) s48_value sxp, s48_value sxo)
{ {
XftFontSet *fs; XftFontSet *fs;
fs = XftListFontsPatternObjects(scx_extract_display(sdpy), fs = XftListFontsPatternObjects(scx_extract_display(sdpy),
s48_extract_integer(sscreen), s48_extract_integer(sscreenno),
scx_extract_xftpattern(sxp), scx_extract_xftpattern(sxp),
scx_extract_xftobjectset(sxo)); scx_extract_xftobjectset(sxo));
return scx_enter_xftfontset(fs); return scx_enter_xftfontset(fs);
} }
s48_value scx_XftFontSetCreate(void)
{
return scx_enter_xftfontset(XftFontSetCreate());
}
s48_value scx_XftFontSetDestroy(s48_value sxfs)
{
XftFontSetDestroy(scx_extract_xftfontset(sxfs));
return S48_UNSPECIFIC;
}
s48_value scx_XftFontSetAdd(s48_value sxfs, s48_value sxp)
{
Bool b;
b = XftFontSetAdd(scx_extract_xftfontset(sxfs),
scx_extract_xftpattern(sxp));
return b ? S48_TRUE : S48_FALSE;
}
s48_value scx_XftColorAllocName(s48_value sdpy, s48_value svisual,
s48_value scolormap, s48_value sname)
{
s48_value res;
XftColor *xftcolor = NULL;
Bool b;
S48_DECLARE_GC_PROTECT(1);
S48_GC_PROTECT_1(res);
b = XftColorAllocName(scx_extract_display(sdpy), scx_extract_visual(svisual),
scx_extract_colormap(scolormap), s48_extract_string(sname),
xftcolor);
res = s48_list_2(b ? S48_TRUE : S48_FALSE,
b ? scx_enter_xftcolor(xftcolor) : S48_FALSE);
S48_GC_UNPROTECT();
return res;
}
s48_value scx_XftColorFree(s48_value sdpy, s48_value svisual,
s48_value scolormap, s48_value sxc)
{
XftColorFree(scx_extract_display(sdpy), scx_extract_visual(svisual),
scx_extract_colormap(scolormap), scx_extract_xftcolor(sxc));
return S48_UNSPECIFIC;
}
/* TODO: XftColorAllocValue */
void scx_xft_init(void) void scx_xft_init(void)
{ {
@ -378,4 +426,10 @@ void scx_xft_init(void)
S48_EXPORT_FUNCTION(scx_XftObjectSetDestroy); S48_EXPORT_FUNCTION(scx_XftObjectSetDestroy);
S48_EXPORT_FUNCTION(scx_XftObjectSetAdd); S48_EXPORT_FUNCTION(scx_XftObjectSetAdd);
S48_EXPORT_FUNCTION(scx_XftListFontsPatternObjects); S48_EXPORT_FUNCTION(scx_XftListFontsPatternObjects);
S48_EXPORT_FUNCTION(scx_XftFontSetCreate);
S48_EXPORT_FUNCTION(scx_XftFontSetDestroy);
S48_EXPORT_FUNCTION(scx_XftFontSetAdd);
S48_EXPORT_FUNCTION(scx_XftColorAllocName);
S48_EXPORT_FUNCTION(scx_XftColorFree);
} }