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.4 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.10 by pcg, Sat Jan 31 00:20:21 2004 UTC

1/*
2 * $Id: defaultfont.h,v 1.4 2003/11/25 11:52:42 pcg Exp $
3 */
4
5#ifndef _DEFAULTFONT_H_ 1#ifndef DEFAULTFONT_H_
6#define _DEFAULTFONT_H_ 2#define DEFAULTFONT_H_
7 3
8#ifdef HAVE_XSETLOCALE 4#ifdef HAVE_XSETLOCALE
9# define X_LOCALE 5# define X_LOCALE
10# include <X11/Xlocale.h> 6# include <X11/Xlocale.h>
11#else 7#else
19#endif 15#endif
20 16
21#include "rxvtlib.h" 17#include "rxvtlib.h"
22#include "feature.h" 18#include "feature.h"
23#include "encoding.h" 19#include "encoding.h"
24#include "rxvtvec.h" 20#include "rxvtstl.h"
21
22struct rxvt_fontprop {
23 enum {
24 medium = 100, bold = 200,
25 roman = 0, italic = 100,
26 };
27 int width, height;
28 int weight, slant;
29};
25 30
26struct rxvt_font { 31struct rxvt_font {
27 // managed by the fontset 32 // managed by the fontset
28#if EXPLICIT_CONTEXT 33 rxvt_t r;
29 rxvt_t rxvt_term; 34 void set_term (rxvt_t r) { this->r = r; }
30 void set_term (pR) { this->rxvt_term = R; } 35
31#else
32 void set_term (pR) { }
33#endif
34 char *name; 36 char *name;
35 codeset cs; 37 codeset cs;
36 bool loaded; 38 bool loaded; // wether we tried loading it before (not wether it's loaded)
37 39
38 // managed by the font object 40 // managed by the font object
39 bool prop; // wether this is a proportional font or has other funny characteristics 41 bool slow; // wether this is a proportional font or has other funny characteristics
40 int ascent, descent, 42 int ascent, descent,
41 width, height; 43 width, height;
42 44
43 void set_name (char *name) 45 void set_name (char *name)
44 { 46 {
45 if (this->name) free (this->name); // let the compiler optimize 47 if (this->name) free (this->name); // let the compiler optimize
46 this->name = name; 48 this->name = name;
47 } 49 }
48 50
49 rxvt_font () { name = 0; } 51 rxvt_font () { name = 0; }
50 ~rxvt_font () { free (name); clear (); }; 52 ~rxvt_font () { clear (); free (name); };
51 53
52 void clear_rect (int x, int y, int w, int h, int color); 54 void clear_rect (int x, int y, int w, int h, int color);
53 55
54 virtual void clear () { }; 56 virtual void clear () { };
55 57
56 virtual bool load (int maxheight) = 0; 58 virtual rxvt_fontprop properties () = 0;
59
60 virtual bool load (const rxvt_fontprop &prop) = 0;
57 virtual bool has_codepoint (uint32_t unicode) = 0; 61 virtual bool has_codepoint (uint32_t unicode) = 0;
58 62
59 virtual void draw (int x, int y, 63 virtual void draw (int x, int y,
60 const text_t *text, int len, 64 const text_t *text, int len,
61 int fg, int bg) = 0; 65 int fg, int bg) = 0;
66#define FONT_UNREF(f) delete f 70#define FONT_UNREF(f) delete f
67 71
68struct rxvt_fallback_font; 72struct rxvt_fallback_font;
69 73
70struct rxvt_fontset { 74struct rxvt_fontset {
71 rxvt_fontset (pR); 75 rxvt_fontset (rxvt_t r);
72 ~rxvt_fontset (); 76 ~rxvt_fontset ();
73 77
74 rxvt_font *new_font (const char *name, codeset cs); 78 rxvt_font *new_font (const char *name, codeset cs);
75 79
76 void populate (const char *desc); 80 void populate (const char *desc);
85 { 89 {
86 return fonts[base_id]; 90 return fonts[base_id];
87 } 91 }
88 92
89private: 93private:
90#ifdef EXPLICIT_CONTEXT 94 rxvt_t r;
91 rxvt_t rxvt_term;
92#endif
93 simplevec<rxvt_font *> fonts; 95 simplevec<rxvt_font *> fonts;
94 const rxvt_fallback_font *fallback; 96 const rxvt_fallback_font *fallback;
95 97
96 int height; 98 rxvt_fontprop base_prop;
97 int base_id; 99 int base_id;
98 100
99 bool realize_font (int i); 101 bool realize_font (int i);
100 void add_fonts (const char *desc); 102 void add_fonts (const char *desc);
101 void clear (); 103 void clear ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines