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.7 by pcg, Thu Dec 18 04:14:30 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines