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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.8 by pcg, Wed Dec 24 09:07:01 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines