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.6 by pcg, Thu Dec 4 00:43:26 2003 UTC vs.
Revision 1.14 by pcg, Tue Feb 24 00:44:23 2004 UTC

1/* 1#ifndef DEFAULTFONT_H_
2 * $Id: defaultfont.h,v 1.6 2003/12/04 00:43:26 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
… …
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"
26
27struct rxvt_fontprop {
28 enum {
29 medium = 100, bold = 200,
30 roman = 0, italic = 100,
31 };
32 int width, height;
33 int weight, slant;
34};
35
36struct rxvt_drawable {
37 rxvt_display *display;
38 Drawable drawable;
39# if XFT
40 XftDraw *xftdrawable;
41#endif
42 rxvt_drawable (rxvt_display *display, Drawable drawable)
43 : display(display), drawable(drawable), xftdrawable(0) { }
44 ~rxvt_drawable ();
45
46 operator Drawable() { return drawable; }
47 operator XftDraw *();
48};
25 49
26struct rxvt_font { 50struct rxvt_font {
27 // managed by the fontset 51 // managed by the fontset
28 rxvt_t r; 52 rxvt_t r;
29 void set_term (rxvt_t r) { this->r = r; } 53 void set_term (rxvt_t r) { this->r = r; }
… …
31 char *name; 55 char *name;
32 codeset cs; 56 codeset cs;
33 bool loaded; // wether we tried loading it before (not wether it's loaded) 57 bool loaded; // wether we tried loading it before (not wether it's loaded)
34 58
35 // managed by the font object 59 // managed by the font object
36 bool prop; // wether this is a proportional font or has other funny characteristics 60 bool slow; // wether this is a proportional font or has other funny characteristics
37 int ascent, descent, 61 int ascent, descent,
38 width, height; 62 width, height;
39 63
40 void set_name (char *name) 64 void set_name (char *name)
41 { 65 {
42 if (this->name) free (this->name); // let the compiler optimize 66 if (this->name) free (this->name); // let the compiler optimize
43 this->name = name; 67 this->name = name;
44 } 68 }
45 69
46 rxvt_font () { name = 0; } 70 rxvt_font () { name = 0; }
47 ~rxvt_font () { free (name); clear (); }; 71 ~rxvt_font () { free (name); };
48 72
49 void clear_rect (int x, int y, int w, int h, int color); 73 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color);
50 74
51 virtual void clear () { }; 75 virtual void clear () { };
52 76
53 virtual bool load (int maxheight) = 0; 77 virtual rxvt_fontprop properties () = 0;
78
79 virtual bool load (const rxvt_fontprop &prop) = 0;
54 virtual bool has_codepoint (uint32_t unicode) = 0; 80 virtual bool has_codepoint (uint32_t unicode) = 0;
55 81
56 virtual void draw (int x, int y, 82 virtual void draw (rxvt_drawable &d,
83 int x, int y,
57 const text_t *text, int len, 84 const text_t *text, int len,
58 int fg, int bg) = 0; 85 int fg, int bg) = 0;
59}; 86};
60 87
61//#define FONT_REF(obj) (obj)->refcnt++ 88#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
62//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
63#define FONT_UNREF(f) delete f
64 89
65struct rxvt_fallback_font; 90struct rxvt_fallback_font;
66 91
67struct rxvt_fontset { 92struct rxvt_fontset {
68 rxvt_fontset (rxvt_t r); 93 rxvt_fontset (rxvt_t r);
69 ~rxvt_fontset (); 94 ~rxvt_fontset ();
70 95
71 rxvt_font *new_font (const char *name, codeset cs); 96 rxvt_font *new_font (const char *name, codeset cs);
72 97
73 void populate (const char *desc); 98 bool populate (const char *desc);
74 int find_font (uint32_t unicode); 99 int find_font (uint32_t unicode);
75 100
76 rxvt_font *operator [](int id) const 101 rxvt_font *operator [] (int id) const
77 { 102 {
78 return fonts[id]; 103 return fonts[id];
79 } 104 }
80 105
81 rxvt_font *base_font () const 106 rxvt_font *base_font () const
… …
86private: 111private:
87 rxvt_t r; 112 rxvt_t r;
88 simplevec<rxvt_font *> fonts; 113 simplevec<rxvt_font *> fonts;
89 const rxvt_fallback_font *fallback; 114 const rxvt_fallback_font *fallback;
90 115
91 int height; 116 rxvt_fontprop base_prop;
92 int base_id; 117 int base_id;
93 118
94 bool realize_font (int i); 119 bool realize_font (int i);
95 void add_fonts (const char *desc); 120 void add_fonts (const char *desc);
96 void clear (); 121 void clear ();

Diff Legend

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