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.10 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.18 by pcg, Fri Apr 2 00:51:09 2004 UTC

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

Diff Legend

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