ion-3-xft/xft-ion3-20090110.patch

   1 diff -Naur ../work/ion-3/de/brush.c ion-3ds-20070203/de/brush.c
   2 --- ../work/ion-3/de/brush.c    2007-02-03 17:50:52.000000000 +0300
   3 +++ ion-3ds-20070203/de/brush.c 2007-02-21 13:11:57.000000000 +0300
   4 @@ -47,6 +47,9 @@
   5
   6      gr_stylespec_init(&brush->current_attr);
   7
   8 +#ifdef XFT
   9 +    brush->draw=NULL;
  10 +#endif /* XFT */
  11      style->usecount++;
  12
  13      if(!grbrush_init(&(brush->grbrush))){
  14 @@ -127,6 +130,10 @@
  15  {
  16      destyle_unref(brush->d);
  17      brush->d=NULL;
  18 +#ifdef XFT
  19 +    if(brush->draw!=NULL)
  20 +           XftDrawDestroy(brush->draw);
  21 +#endif /* XFT */
  22      gr_stylespec_unalloc(&brush->current_attr);
  23      grbrush_deinit(&(brush->grbrush));
  24  }
  25 @@ -138,6 +145,21 @@
  26  }
  27
  28
  29 +#ifdef XFT
  30 +XftDraw *debrush_get_draw(DEBrush *brush, Drawable d)
  31 +{
  32 +       if(brush->draw==NULL)
  33 +               brush->draw=XftDrawCreate(ioncore_g.dpy, d,
  34 +                                         XftDEDefaultVisual(),
  35 +                                         DefaultColormap(ioncore_g.dpy,
  36 +                                                         0));
  37 +       else
  38 +               XftDrawChange(brush->draw, d);
  39 +
  40 +       return brush->draw;
  41 +}
  42 +#endif
  43 +
  44  /*}}}*/
  45
  46
  47 diff -Naur ../work/ion-3/de/brush.h ion-3ds-20070203/de/brush.h
  48 --- ../work/ion-3/de/brush.h    2007-02-03 17:50:52.000000000 +0300
  49 +++ ion-3ds-20070203/de/brush.h 2007-02-21 13:11:57.000000000 +0300
  50 @@ -17,6 +17,9 @@
  51  #include <ioncore/common.h>
  52  #include <ioncore/gr.h>
  53  #include <ioncore/rectangle.h>
  54 +#ifdef XFT
  55 +#include <X11/Xft/Xft.h>
  56 +#endif /* XFT */
  57
  58  INTRCLASS(DEBrush);
  59
  60 @@ -36,6 +39,9 @@
  61  DECLCLASS(DEBrush){
  62      GrBrush grbrush;
  63      DEStyle *d;
  64 +#ifdef XFT
  65 +    XftDraw *draw;
  66 +#endif
  67      DEBrushExtrasFn *extras_fn;
  68      int indicator_w;
  69      Window win;
  70 @@ -111,5 +117,8 @@
  71  extern void debrush_fill_area(DEBrush *brush, const WRectangle *geom);
  72  extern void debrush_clear_area(DEBrush *brush, const WRectangle *geom);
  73
  74 +#ifdef XFT
  75 +XftDraw *debrush_get_draw(DEBrush *brush, Drawable d);
  76 +#endif
  77
  78  #endif /* ION_DE_BRUSH_H */
  79 diff -Naur ../work/ion-3/de/colour.c ion-3ds-20070203/de/colour.c
  80 --- ../work/ion-3/de/colour.c   2007-02-03 17:50:52.000000000 +0300
  81 +++ ion-3ds-20070203/de/colour.c        2007-02-21 13:11:57.000000000 +0300
  82 @@ -15,9 +15,21 @@
  83
  84  bool de_alloc_colour(WRootWin *rootwin, DEColour *ret, const char *name)
  85  {
  86 +#ifndef XFT
  87      XColor c;
  88      bool ok=FALSE;
  89 +#else /* XFT */
  90 +    if(name==NULL)
  91 +           return FALSE;
  92 +    return XftColorAllocName(
  93 +           ioncore_g.dpy,
  94 +           XftDEDefaultVisual(),
  95 +           rootwin->default_cmap,
  96 +           name,
  97 +           ret);
  98 +#endif /* XFT */
  99
 100 +#ifndef XFT
 101      if(name==NULL)
 102          return FALSE;
 103
 104 @@ -28,11 +40,13 @@
 105      }
 106
 107      return ok;
 108 +#endif /* ! XFT */
 109  }
 110
 111
 112  bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out)
 113  {
 114 +#ifndef XFT
 115      XColor c;
 116      c.pixel=in;
 117      XQueryColor(ioncore_g.dpy, rootwin->default_cmap, &c);
 118 @@ -41,11 +55,20 @@
 119          return TRUE;
 120      }
 121      return FALSE;
 122 +#else /* XFT */
 123 +    return XftColorAllocName(
 124 +           ioncore_g.dpy,
 125 +           XftDEDefaultVisual(),
 126 +           rootwin->default_cmap,
 127 +           &(in.color),
 128 +           out);
 129 +#endif /* XFT */
 130  }
 131
 132
 133  void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg)
 134  {
 135 +#ifndef XFT
 136      DEColour pixels[5];
 137
 138      pixels[0]=cg->bg;
 139 @@ -57,15 +80,26 @@
 140      XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 5, 0);
 141
 142      gr_stylespec_unalloc(&cg->spec);
 143 +#else /* XFT */
 144 +    de_free_colour(rootwin, cg->bg);
 145 +    de_free_colour(rootwin, cg->fg);
 146 +    de_free_colour(rootwin, cg->hl);
 147 +    de_free_colour(rootwin, cg->sh);
 148 +    de_free_colour(rootwin, cg->pad);
 149 +#endif /* XFT */
 150  }
 151
 152
 153  void de_free_colour(WRootWin *rootwin, DEColour col)
 154  {
 155 +#ifndef XFT
 156      DEColour pixels[1];
 157
 158      pixels[0]=col;
 159
 160      XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 1, 0);
 161 +#else /* XFT */
 162 +    XftColorFree(ioncore_g.dpy, XftDEDefaultVisual(), rootwin->default_cmap, &col);
 163 +#endif /* XFT */
 164  }
 165
 166 diff -Naur ../work/ion-3/de/colour.h ion-3ds-20070203/de/colour.h
 167 --- ../work/ion-3/de/colour.h   2007-02-03 17:50:52.000000000 +0300
 168 +++ ion-3ds-20070203/de/colour.h        2007-02-21 13:11:57.000000000 +0300
 169 @@ -15,12 +15,19 @@
 170  #include <ioncore/common.h>
 171  #include <ioncore/global.h>
 172  #include <ioncore/rootwin.h>
 173 +#ifdef XFT
 174 +#include <X11/Xft/Xft.h>
 175 +#endif /* XFT */
 176
 177
 178  INTRSTRUCT(DEColourGroup);
 179
 180
 181 +#ifndef XFT
 182  typedef unsigned long DEColour;
 183 +#else /* XFT */
 184 +typedef XftColor DEColour;
 185 +#endif /* XFT */
 186
 187
 188  DECLSTRUCT(DEColourGroup){
 189 @@ -37,5 +44,6 @@
 190  bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out);
 191  void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg);
 192  void de_free_colour(WRootWin *rootwin, DEColour col);
 193 +#define XftDEDefaultVisual()    DefaultVisual(ioncore_g.dpy, 0)
 194
 195  #endif /* ION_DE_COLOUR_H */
 196 diff -Naur ../work/ion-3/de/draw.c ion-3ds-20070203/de/draw.c
 197 --- ../work/ion-3/de/draw.c     2007-02-03 17:50:52.000000000 +0300
 198 +++ ion-3ds-20070203/de/draw.c  2007-02-21 13:11:57.000000000 +0300
 199 @@ -22,6 +22,14 @@
 200  #include <X11/extensions/shape.h>
 201
 202
 203 +#ifndef XFT
 204 +#define PIXEL(x) x
 205 +#else /* XFT */
 206 +#define PIXEL(x) x.pixel
 207 +#endif /* XFT */
 208 +
 209 +
 210 +
 211  /*{{{ Colour group lookup */
 212
 213
 214 @@ -86,8 +94,7 @@
 215      w--;
 216      h--;
 217
 218 -    XSetForeground(ioncore_g.dpy, gc, tlc);
 219 -
 220 +    XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
 221
 222      a=(br!=0);
 223      b=0;
 224 @@ -104,9 +111,8 @@
 225
 226          XDrawLines(ioncore_g.dpy, win, gc, points, 3, CoordModeOrigin);
 227      }
 228 -
 229
 230 -    XSetForeground(ioncore_g.dpy, gc, brc);
 231 +    XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
 232
 233      a=(tl!=0);
 234      b=0;
 235 @@ -143,23 +143,23 @@
 236                              GrBorderLine line)
 237  {
 238      if(line==GR_BORDERLINE_LEFT && geom->h>0 && tl>0){
 239 -        XSetForeground(ioncore_g.dpy, gc, tlc);
 240 -        XSetBackground(ioncore_g.dpy, gc, tlc);
 241 +        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
 242 +        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
 243          XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, tl, geom->h);
 244          geom->x+=tl;
 245      }else if(line==GR_BORDERLINE_TOP && geom->w>0 && tl>0){
 246 -        XSetForeground(ioncore_g.dpy, gc, tlc);
 247 -        XSetBackground(ioncore_g.dpy, gc, tlc);
 248 +        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
 249 +        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
 250          XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, geom->w, tl);
 251          geom->y+=tl;
 252      }else if(line==GR_BORDERLINE_RIGHT && geom->h>0 && br>0){
 253 -        XSetForeground(ioncore_g.dpy, gc, brc);
 254 -        XSetBackground(ioncore_g.dpy, gc, brc);
 255 +        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
 256 +        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
 257          XFillRectangle(ioncore_g.dpy, win, gc, geom->x+geom->w-br, geom->y, br, geom->h);
 258          geom->w-=br;
 259      }else if(line==GR_BORDERLINE_BOTTOM && geom->w>0 && br>0){
 260 -        XSetForeground(ioncore_g.dpy, gc, brc);
 261 -        XSetBackground(ioncore_g.dpy, gc, brc);
 262 +        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
 263 +        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
 264          XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y+geom->h-br, geom->w, br);
 265          geom->h-=br;
 266      }
 267 @@ -293,7 +299,7 @@
 268      }
 269
 270      if(ISSET(a2, GR_ATTR(tagged)) || ISSET(a1, GR_ATTR(tagged))){
 271 -        XSetForeground(ioncore_g.dpy, d->copy_gc, cg->fg);
 272 +        XSetForeground(ioncore_g.dpy, d->copy_gc, PIXEL(cg->fg));
 273
 274          copy_masked(brush, d->tag_pixmap, brush->win, 0, 0,
 275                      d->tag_pixmap_w, d->tag_pixmap_h,
 276 @@ -348,7 +354,7 @@
 277      GC gc=brush->d->normal_gc;
 278
 279      if(TRUE/*needfill*/){
 280 -        XSetForeground(ioncore_g.dpy, gc, cg->bg);
 281 +        XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
 282          XFillRectangle(ioncore_g.dpy, brush->win, gc, geom->x, geom->y,
 283                         geom->w, geom->h);
 284      }
 285 @@ -513,7 +519,7 @@
 286          attr.background_pixmap=ParentRelative;
 287      }else{
 288          attrflags=CWBackPixel;
 289 -        attr.background_pixel=brush->d->cgrp.bg;
 290 +        attr.background_pixel=brush->d->PIXEL(cgrp.bg);
 291      }
 292
 293      XChangeWindowAttributes(ioncore_g.dpy, brush->win, attrflags, &attr);
 294 @@ -529,7 +535,7 @@
 295      if(cg==NULL)
 296          return;
 297
 298 -    XSetForeground(ioncore_g.dpy, gc, cg->bg);
 299 +    XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
 300      XFillRectangle(ioncore_g.dpy, brush->win, gc,
 301                     geom->x, geom->y, geom->w, geom->h);
 302  }
 303 diff -Naur ../work/ion-3/de/font.c ion-3ds-20070203/de/font.c
 304 --- ../work/ion-3/de/font.c     2007-02-03 17:50:52.000000000 +0300
 305 +++ ion-3ds-20070203/de/font.c  2007-02-21 13:11:57.000000000 +0300
 306 @@ -14,7 +14,9 @@
 307  #include <libtu/objp.h>
 308  #include <ioncore/common.h>
 309  #include "font.h"
 310 +#ifndef XFT
 311  #include "fontset.h"
 312 +#endif /* ! XFT */
 313  #include "brush.h"
 314
 315
 316 @@ -26,6 +28,9 @@
 317
 318  DEFont *de_load_font(const char *fontname)
 319  {
 320 +#ifdef XFT
 321 +    XftFont *font;
 322 +#endif
 323      DEFont *fnt;
 324      XFontSet fontset=NULL;
 325      XFontStruct *fontstruct=NULL;
 326 @@ -40,6 +45,7 @@
 327          }
 328      }
 329
 330 +#ifndef XFT
 331      if(ioncore_g.use_mb){
 332          fontset=de_create_font_set(fontname);
 333          if(fontset!=NULL){
 334 @@ -66,13 +72,34 @@
 335          return NULL;
 336      }
 337
 338 +#else /* XFT */
 339 +    if(strncmp(fontname, "xft:", 4)==0){
 340 +           font=XftFontOpenName(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy),
 341 +                                fontname+4);
 342 +    }else{
 343 +           font=XftFontOpenXlfd(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), fontname);
 344 +    }
 345 +
 346 +    if(font==NULL){
 347 +           if(strcmp(fontname, CF_FALLBACK_FONT_NAME)!=0){
 348 +                   warn(TR("Could not load font \"%s\", trying \"%s\""),
 349 +                        fontname, CF_FALLBACK_FONT_NAME);
 350 +                   return de_load_font(CF_FALLBACK_FONT_NAME);
 351 +           }
 352 +           return NULL;
 353 +    }
 354 +#endif /* XFT */
 355      fnt=ALLOC(DEFont);
 356
 357      if(fnt==NULL)
 358          return NULL;
 359
 360 +#ifndef XFT
 361      fnt->fontset=fontset;
 362      fnt->fontstruct=fontstruct;
 363 +#else
 364 +    fnt->font=font;
 365 +#endif
 366      fnt->pattern=scopy(fontname);
 367      fnt->next=NULL;
 368      fnt->prev=NULL;
 369 @@ -92,11 +119,13 @@
 370      style->font=font;
 371      font->refcount++;
 372
 373 +#ifndef XFT
 374      if(style->font->fontstruct!=NULL){
 375          XSetFont(ioncore_g.dpy, style->normal_gc,
 376                   style->font->fontstruct->fid);
 377      }
 378
 379 +#endif /* ! XFT */
 380      return TRUE;
 381  }
 382
 383 @@ -111,11 +140,13 @@
 384      if(style->font==NULL)
 385          return FALSE;
 386
 387 +#ifndef XFT
 388      if(style->font->fontstruct!=NULL){
 389          XSetFont(ioncore_g.dpy, style->normal_gc,
 390                   style->font->fontstruct->fid);
 391      }
 392
 393 +#endif /* ! XFT */
 394      return TRUE;
 395  }
 396
 397 @@ -125,10 +156,15 @@
 398      if(--font->refcount!=0)
 399          return;
 400
 401 +#ifndef XFT
 402      if(font->fontset!=NULL)
 403          XFreeFontSet(ioncore_g.dpy, font->fontset);
 404      if(font->fontstruct!=NULL)
 405          XFreeFont(ioncore_g.dpy, font->fontstruct);
 406 +#else /* XFT */
 407 +    if(font->font!=NULL)
 408 +           XftFontClose(ioncore_g.dpy, font->font);
 409 +#endif /* XFT */
 410      if(font->pattern!=NULL)
 411          free(font->pattern);
 412
 413 @@ -156,6 +192,7 @@
 414
 415  void defont_get_font_extents(DEFont *font, GrFontExtents *fnte)
 416  {
 417 +#ifndef XFT
 418      if(font->fontset!=NULL){
 419          XFontSetExtents *ext=XExtentsOfFontSet(font->fontset);
 420          if(ext==NULL)
 421 @@ -171,7 +208,14 @@
 422          fnte->baseline=fnt->ascent;
 423          return;
 424      }
 425 -
 426 +#else /* XFT */
 427 +    if(font->font!=NULL){
 428 +           fnte->max_height=font->font->ascent+font->font->descent;
 429 +           fnte->max_width=font->font->max_advance_width;
 430 +           fnte->baseline=font->font->ascent;
 431 +           return;
 432 +    }
 433 +#endif /* XFT */
 434  fail:
 435      DE_RESET_FONT_EXTENTS(fnte);
 436  }
 437 @@ -188,20 +232,35 @@
 438
 439  uint defont_get_text_width(DEFont *font, const char *text, uint len)
 440  {
 441 +#ifndef XFT
 442      if(font->fontset!=NULL){
 443          XRectangle lext;
 444  #ifdef CF_DE_USE_XUTF8
 445 -        if(ioncore_g.enc_utf8)
 446 -            Xutf8TextExtents(font->fontset, text, len, NULL, &lext);
 447 -        else
 448 +       if(ioncore_g.enc_utf8)
 449 +               Xutf8TextExtents(font->fontset, text, len, NULL, &lext);
 450 +       else
 451  #endif
 452 -            XmbTextExtents(font->fontset, text, len, NULL, &lext);
 453 -        return lext.width;
 454 +               XmbTextExtents(font->fontset, text, len, NULL, &lext);
 455 +       return lext.width;
 456      }else if(font->fontstruct!=NULL){
 457          return XTextWidth(font->fontstruct, text, len);
 458      }else{
 459          return 0;
 460      }
 461 +#else /* XFT */
 462 +    if(font->font!=NULL){
 463 +           XGlyphInfo extents;
 464 +           if(ioncore_g.enc_utf8)
 465 +                   XftTextExtentsUtf8(ioncore_g.dpy, font->font, (XftChar8 *)text, len,
 466 +                                      &extents);
 467 +           else
 468 +                   XftTextExtents8(ioncore_g.dpy, font->font, (XftChar8 *)text, len,
 469 +                                   &extents);
 470 +           return extents.xOff;
 471 +    }else{
 472 +           return 0;
 473 +    }
 474 +#endif /* XFT */
 475  }
 476
 477
 478 @@ -211,6 +270,7 @@
 479  /*{{{ String drawing */
 480
 481
 482 +#ifndef XFT
 483  void debrush_do_draw_string_default(DEBrush *brush, int x, int y,
 484                                      const char *str, int len, bool needfill,
 485                                      DEColourGroup *colours)
 486 @@ -256,6 +316,41 @@
 487      }
 488  }
 489
 490 +#else /* XFT */
 491 +void debrush_do_draw_string_default(DEBrush *brush,
 492 +                                   int x, int y, const char *str,
 493 +                                   int len, bool needfill,
 494 +                                   DEColourGroup *colours)
 495 +{
 496 +   Window win = brush->win;
 497 +   GC gc=brush->d->normal_gc;
 498 +   XftDraw *draw;
 499 +   XftFont *font;
 500 +
 501 +   if(brush->d->font==NULL)
 502 +          return;
 503 +
 504 +   font=brush->d->font->font;
 505 +   draw=debrush_get_draw(brush, win);
 506 +
 507 +   if(needfill){
 508 +          XGlyphInfo extents;
 509 +          if(ioncore_g.enc_utf8)
 510 +                  XftTextExtentsUtf8(ioncore_g.dpy, font, (XftChar8 *)str, len,
 511 +                                     &extents);
 512 +          else
 513 +                  XftTextExtents8(ioncore_g.dpy, font, (XftChar8 *)str, len, &extents);
 514 +          XftDrawRect(draw, &(colours->bg), x-extents.x, y-extents.y,
 515 +                      extents.width+10, extents.height);
 516 +   }
 517 +
 518 +   if(ioncore_g.enc_utf8)
 519 +          XftDrawStringUtf8(draw, &(colours->fg), font, x, y, (XftChar8 *)str,
 520 +                            len);
 521 +   else
 522 +          XftDrawString8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, len);
 523 +}
 524 +#endif /* XFT */
 525
 526  void debrush_do_draw_string(DEBrush *brush, int x, int y,
 527                              const char *str, int len, bool needfill,
 528 diff -Naur ../work/ion-3/de/font.h ion-3ds-20070203/de/font.h
 529 --- ../work/ion-3/de/font.h     2007-02-03 17:50:52.000000000 +0300
 530 +++ ion-3ds-20070203/de/font.h  2007-02-21 13:11:57.000000000 +0300
 531 @@ -14,6 +14,9 @@
 532
 533  #include <ioncore/common.h>
 534  #include <ioncore/gr.h>
 535 +#ifdef XFT
 536 +#include <X11/Xft/Xft.h>
 537 +#endif /* XFT */
 538
 539  INTRSTRUCT(DEFont);
 540
 541 @@ -29,6 +32,9 @@
 542      int refcount;
 543      XFontSet fontset;
 544      XFontStruct *fontstruct;
 545 +#ifdef XFT /* XFT */
 546 +    XftFont *font;
 547 +#endif /* XFT */
 548      DEFont *next, *prev;
 549  };
 550
 551 diff -Naur ../work/ion-3/de/init.c ion-3ds-20070203/de/init.c
 552 --- ../work/ion-3/de/init.c     2007-02-03 17:50:52.000000000 +0300
 553 +++ ion-3ds-20070203/de/init.c  2007-02-21 13:11:57.000000000 +0300
 554 @@ -165,17 +165,26 @@
 555  {
 556      bool bgset;
 557      DEColour padinh;
 558 -
 559 +    DEColour black, white;
 560 +
 561 +#ifdef XFT
 562 +    de_alloc_colour(rootwin, &black, "black");
 563 +    de_alloc_colour(rootwin, &white, "white");
 564 +#else
 565 +    black=DE_BLACK(rootwin);
 566 +    white=DE_WHITE(rootwin);
 567 +#endif
 568 +
 569      de_get_colour(rootwin, &(cg->hl), tab, "highlight_colour",
 570 -                  (based_on ? based_on->cgrp.hl : DE_WHITE(rootwin)));
 571 +                  (based_on ? based_on->cgrp.hl : white));
 572      de_get_colour(rootwin, &(cg->sh), tab, "shadow_colour",
 573 -                  (based_on ? based_on->cgrp.sh : DE_WHITE(rootwin)));
 574 +                  (based_on ? based_on->cgrp.sh : white));
 575      de_get_colour(rootwin, &(cg->fg), tab, "foreground_colour",
 576 -                  (based_on ? based_on->cgrp.fg : DE_WHITE(rootwin)));
 577 +                  (based_on ? based_on->cgrp.fg : white));
 578      bgset=de_get_colour(rootwin, &(cg->bg), tab, "background_colour",
 579 -                        (based_on ? based_on->cgrp.bg : DE_BLACK(rootwin)));
 580 +                        (based_on ? based_on->cgrp.bg : black));
 581
 582 -    padinh=(based_on ? based_on->cgrp.pad : DE_WHITE(rootwin));
 583 +    padinh=(based_on ? based_on->cgrp.pad : white);
 584
 585      de_get_colour_(rootwin, &(cg->pad), tab, "padding_colour",
 586                     (bgset ? cg->bg : padinh), padinh);
 587 diff -Naur ../work/ion-3/de/style.c ion-3ds-20070203/de/style.c
 588 --- ../work/ion-3/de/style.c    2007-02-03 17:50:52.000000000 +0300
 589 +++ ion-3ds-20070203/de/style.c 2007-02-21 13:11:57.000000000 +0300
 590 @@ -74,10 +74,17 @@
 591      /*gcv.function=GXclear;*/
 592      gcv.stipple=stipple_pixmap;
 593      gcvmask=GCFillStyle|GCStipple/*|GCFunction*/;
 594 +#ifndef XFT
 595      if(style->font!=NULL && style->font->fontstruct!=NULL){
 596          gcv.font=style->font->fontstruct->fid;
 597          gcvmask|=GCFont;
 598      }
 599 +#else /* XFT */
 600 +//    if(style->font!=NULL){
 601 +//        gcv.font=style->font;
 602 +//        gcvmask|=GCFont;
 603 +//    }
 604 +#endif /* XFT */
 605
 606      style->stipple_gc=XCreateGC(dpy, root, gcvmask, &gcv);
 607      XCopyGC(dpy, style->normal_gc,
 608 @@ -205,6 +212,14 @@
 609
 610  bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name)
 611  {
 612 +    DEColour black, white;
 613 +#ifdef XFT
 614 +    de_alloc_colour(rootwin, &black, "black");
 615 +    de_alloc_colour(rootwin, &white, "white");
 616 +#else
 617 +    black=DE_BLACK(rootwin);
 618 +    white=DE_WHITE(rootwin);
 619 +#endif /* XFT */
 620      if(!gr_stylespec_load(&style->spec, name))
 621          return FALSE;
 622
 623 @@ -226,11 +241,11 @@
 624      style->textalign=DEALIGN_CENTER;
 625
 626      style->cgrp_alloced=FALSE;
 627 -    style->cgrp.bg=DE_BLACK(rootwin);
 628 -    style->cgrp.pad=DE_BLACK(rootwin);
 629 -    style->cgrp.fg=DE_WHITE(rootwin);
 630 -    style->cgrp.hl=DE_WHITE(rootwin);
 631 -    style->cgrp.sh=DE_WHITE(rootwin);
 632 +    style->cgrp.bg=black;
 633 +    style->cgrp.pad=black;
 634 +    style->cgrp.fg=white;
 635 +    style->cgrp.hl=white;
 636 +    style->cgrp.sh=white;
 637      gr_stylespec_init(&style->cgrp.spec);
 638
 639      style->font=NULL;
 640 diff -Naur ../work/ion-3/de/style.h ion-3ds-20070203/de/style.h
 641 --- ../work/ion-3/de/style.h    2007-02-03 17:50:52.000000000 +0300
 642 +++ ion-3ds-20070203/de/style.h 2007-02-21 13:11:57.000000000 +0300
 643 @@ -76,6 +76,7 @@
 644      Pixmap tag_pixmap;
 645      int tag_pixmap_w;
 646      int tag_pixmap_h;
 647 +    int xft_style;
 648
 649      DEStyle *next, *prev;
 650  };
 651 --- ../work/ion-3/system.mk     2007-05-10 22:45:16.000000000 +0400
 652 +++ ion-3ds-20070203/system.mk  2007-05-10 22:45:07.000000000 +0400
 653 @@ -115,6 +115,16 @@
 654  #EXTRA_LIBS += -lintl
 655  #EXTRA_INCLUDES +=
 656
 657 +##
 658 +## Xft support
 659 +##
 660 +
 661 +#USE_XFT=1
 662 +
 663 +ifeq ($(USE_XFT),1)
 664 +EXTRA_INCLUDES += `xft-config --cflags` -DXFT
 665 +EXTRA_LIBS += `xft-config --libs`
 666 +endif
 667
 668  ##
 669  ## C compiler