ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.h
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.h (file contents):
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.19 by root, Mon Jul 26 14:57:12 2004 UTC

1/* 1#ifndef DEFAULTFONT_H_
2 * $Id: defaultfont.h,v 1.7 2003/12/18 04:14:30 pcg Exp $ 2#define DEFAULTFONT_H_
3 */
4 3
5#ifndef _DEFAULTFONT_H_ 4#include <X11/Xlib.h>
6#define _DEFAULTFONT_H_ 5#if XFT
6# include <X11/Xft/Xft.h>
7#endif
7 8
8#ifdef HAVE_XSETLOCALE 9#ifdef HAVE_XSETLOCALE
9# define X_LOCALE 10# define X_LOCALE
10# include <X11/Xlocale.h> 11# include <X11/Xlocale.h>
11#else 12#else
12# ifdef HAVE_SETLOCALE 13# ifdef HAVE_SETLOCALE
13# include <locale.h> 14# include <clocale>
14# endif 15# endif
15#endif /* HAVE_XLOCALE */ 16#endif /* HAVE_XLOCALE */
16 17
17#ifdef HAVE_NL_LANGINFO 18#ifdef HAVE_NL_LANGINFO
18# include <langinfo.h> 19# include <langinfo.h>
19#endif 20#endif
20 21
21#include "rxvtlib.h" 22#include "rxvtlib.h"
22#include "feature.h" 23#include "feature.h"
23#include "encoding.h" 24#include "encoding.h"
24#include "rxvtvec.h" 25#include "rxvtstl.h"
25 26
26struct rxvt_fontprop { 27struct rxvt_fontprop {
27 enum { 28 enum {
28 medium = 100, bold = 200, 29 medium = 100, bold = 200,
29 roman = 0, italic = 100, 30 roman = 0, italic = 100,
30 }; 31 };
31 int height; 32 int width, height;
32 int weight; 33 int weight, slant;
33 int slant; 34};
35
36struct rxvt_drawable {
37 rxvt_display *display;
38 Drawable drawable;
39#if XFT
40 XftDraw *xftdrawable;
41 operator XftDraw *();
42#endif
43
44 rxvt_drawable (rxvt_display *display, Drawable drawable)
45 : display(display),
46#if XFT
47 xftdrawable(0),
48#endif
49 drawable(drawable)
50 { }
51
52#if XFT
53 ~rxvt_drawable ();
54#endif
55
56 operator Drawable() { return drawable; }
34}; 57};
35 58
36struct rxvt_font { 59struct rxvt_font {
60 struct rxvt_fontset *fs;
37 // managed by the fontset 61 // managed by the fontset
38 rxvt_t r; 62 rxvt_t r;
39 void set_term (rxvt_t r) { this->r = r; } 63 void set_term (rxvt_t r) { this->r = r; }
40 64
41 char *name; 65 char *name;
… …
52 if (this->name) free (this->name); // let the compiler optimize 76 if (this->name) free (this->name); // let the compiler optimize
53 this->name = name; 77 this->name = name;
54 } 78 }
55 79
56 rxvt_font () { name = 0; } 80 rxvt_font () { name = 0; }
57 ~rxvt_font () { free (name); clear (); }; 81 ~rxvt_font () { free (name); };
58 82
59 void clear_rect (int x, int y, int w, int h, int color); 83 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color);
60 84
61 virtual void clear () { }; 85 virtual void clear () { };
62 86
63 virtual rxvt_fontprop properties () = 0; 87 virtual rxvt_fontprop properties () = 0;
64 88
65 virtual bool load (const rxvt_fontprop &prop) = 0; 89 virtual bool load (const rxvt_fontprop &prop) = 0;
66 virtual bool has_codepoint (uint32_t unicode) = 0; 90 virtual bool has_codepoint (uint32_t unicode) = 0;
67 91
68 virtual void draw (int x, int y, 92 virtual void draw (rxvt_drawable &d,
93 int x, int y,
69 const text_t *text, int len, 94 const text_t *text, int len,
70 int fg, int bg) = 0; 95 int fg, int bg) = 0;
71}; 96};
72 97
73//#define FONT_REF(obj) (obj)->refcnt++ 98#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
74//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
75#define FONT_UNREF(f) delete f
76 99
77struct rxvt_fallback_font; 100struct rxvt_fallback_font;
78 101
79struct rxvt_fontset { 102struct rxvt_fontset {
103 char *fontdesc;
104
80 rxvt_fontset (rxvt_t r); 105 rxvt_fontset (rxvt_t r);
81 ~rxvt_fontset (); 106 ~rxvt_fontset ();
82 107
83 rxvt_font *new_font (const char *name, codeset cs); 108 rxvt_font *new_font (const char *name, codeset cs);
84 109
85 void populate (const char *desc); 110 bool populate (const char *desc);
86 int find_font (uint32_t unicode); 111 int find_font (uint32_t unicode, bool bold = false);
87 112
88 rxvt_font *operator [](int id) const 113 rxvt_font *operator [] (int id) const
89 { 114 {
90 return fonts[id]; 115 return fonts[id];
91 } 116 }
92 117
93 rxvt_font *base_font () const 118 rxvt_font *base_font () const

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines