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.12 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines