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.3 by pcg, Tue Nov 25 09:29:11 2003 UTC vs.
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC

1/* 1/*
2 * $Id: defaultfont.h,v 1.3 2003/11/25 09:29:11 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
26typedef struct rxvt_vars rxvt_t; 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};
27 35
28struct rxvt_font { 36struct rxvt_font {
29 // managed by the fontset 37 // managed by the fontset
30#if EXPLICIT_CONTEXT 38 rxvt_t r;
31 rxvt_t *rxvt_term; 39 void set_term (rxvt_t r) { this->r = r; }
32 void set_term (pR) { this->rxvt_term = R; } 40
33#else
34 void set_term (pR) { }
35#endif
36 char *name; 41 char *name;
37 codeset cs; 42 codeset cs;
38 bool loaded; 43 bool loaded; // wether we tried loading it before (not wether it's loaded)
39 44
40 // managed by the font object 45 // managed by the font object
41 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
42 int ascent, descent, 47 int ascent, descent,
43 width, height; 48 width, height;
44 49
45 void set_name (char *name) 50 void set_name (char *name)
46 { 51 {
53 58
54 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);
55 60
56 virtual void clear () { }; 61 virtual void clear () { };
57 62
58 virtual bool load (int maxheight) = 0; 63 virtual rxvt_fontprop properties () = 0;
64
65 virtual bool load (const rxvt_fontprop &prop) = 0;
59 virtual bool has_codepoint (uint32_t unicode) = 0; 66 virtual bool has_codepoint (uint32_t unicode) = 0;
60 67
61 virtual void draw (int x, int y, 68 virtual void draw (int x, int y,
62 const text_t *text, int len, 69 const text_t *text, int len,
63 int fg, int bg) = 0; 70 int fg, int bg) = 0;
68#define FONT_UNREF(f) delete f 75#define FONT_UNREF(f) delete f
69 76
70struct rxvt_fallback_font; 77struct rxvt_fallback_font;
71 78
72struct rxvt_fontset { 79struct rxvt_fontset {
73 rxvt_fontset (pR); 80 rxvt_fontset (rxvt_t r);
74 ~rxvt_fontset (); 81 ~rxvt_fontset ();
75 82
76 rxvt_font *new_font (const char *name, codeset cs); 83 rxvt_font *new_font (const char *name, codeset cs);
77 84
78 void populate (const char *desc); 85 void populate (const char *desc);
87 { 94 {
88 return fonts[base_id]; 95 return fonts[base_id];
89 } 96 }
90 97
91private: 98private:
92#ifdef EXPLICIT_CONTEXT 99 rxvt_t r;
93 rxvt_t *rxvt_term;
94#endif
95 simplevec<rxvt_font *> fonts; 100 simplevec<rxvt_font *> fonts;
96 const rxvt_fallback_font *fallback; 101 const rxvt_fallback_font *fallback;
97 102
98 int height; 103 rxvt_fontprop base_prop;
99 int base_id; 104 int base_id;
100 105
101 bool realize_font (int i); 106 bool realize_font (int i);
102 void add_fonts (const char *desc); 107 void add_fonts (const char *desc);
103 void clear (); 108 void clear ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines