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.8 by pcg, Wed Dec 24 09:07:01 2003 UTC

1/* 1/*
2 * $Id: defaultfont.h,v 1.6 2003/12/04 00:43:26 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
26struct rxvt_fontprop {
27 enum {
28 medium = 100, bold = 200,
29 roman = 0, italic = 100,
30 };
31 int width, height;
32 int weight, slant;
33};
34
26struct rxvt_font { 35struct rxvt_font {
27 // managed by the fontset 36 // managed by the fontset
28 rxvt_t r; 37 rxvt_t r;
29 void set_term (rxvt_t r) { this->r = r; } 38 void set_term (rxvt_t r) { this->r = r; }
30 39
31 char *name; 40 char *name;
32 codeset cs; 41 codeset cs;
33 bool loaded; // wether we tried loading it before (not wether it's loaded) 42 bool loaded; // wether we tried loading it before (not wether it's loaded)
34 43
35 // managed by the font object 44 // managed by the font object
36 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
37 int ascent, descent, 46 int ascent, descent,
38 width, height; 47 width, height;
39 48
40 void set_name (char *name) 49 void set_name (char *name)
41 { 50 {
… …
48 57
49 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);
50 59
51 virtual void clear () { }; 60 virtual void clear () { };
52 61
53 virtual bool load (int maxheight) = 0; 62 virtual rxvt_fontprop properties () = 0;
63
64 virtual bool load (const rxvt_fontprop &prop) = 0;
54 virtual bool has_codepoint (uint32_t unicode) = 0; 65 virtual bool has_codepoint (uint32_t unicode) = 0;
55 66
56 virtual void draw (int x, int y, 67 virtual void draw (int x, int y,
57 const text_t *text, int len, 68 const text_t *text, int len,
58 int fg, int bg) = 0; 69 int fg, int bg) = 0;
… …
86private: 97private:
87 rxvt_t r; 98 rxvt_t r;
88 simplevec<rxvt_font *> fonts; 99 simplevec<rxvt_font *> fonts;
89 const rxvt_fallback_font *fallback; 100 const rxvt_fallback_font *fallback;
90 101
91 int height; 102 rxvt_fontprop base_prop;
92 int base_id; 103 int base_id;
93 104
94 bool realize_font (int i); 105 bool realize_font (int i);
95 void add_fonts (const char *desc); 106 void add_fonts (const char *desc);
96 void clear (); 107 void clear ();

Diff Legend

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