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.5 by pcg, Tue Nov 25 15:25:17 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.5 2003/11/25 15:25:17 pcg Exp $
3 */ 3 */
4 4
5#ifndef _DEFAULTFONT_H_ 5#ifndef _DEFAULTFONT_H_
6#define _DEFAULTFONT_H_ 6#define _DEFAULTFONT_H_
7 7
23#include "encoding.h" 23#include "encoding.h"
24#include "rxvtvec.h" 24#include "rxvtvec.h"
25 25
26struct rxvt_font { 26struct rxvt_font {
27 // managed by the fontset 27 // managed by the fontset
28#if EXPLICIT_CONTEXT 28 rxvt_t r;
29 rxvt_t rxvt_term; 29 void set_term (rxvt_t r) { this->r = r; }
30 void set_term (pR) { this->rxvt_term = R; } 30
31#else
32 void set_term (pR) { }
33#endif
34 char *name; 31 char *name;
35 codeset cs; 32 codeset cs;
36 bool loaded; 33 bool loaded;
37 34
38 // managed by the font object 35 // managed by the font object
66#define FONT_UNREF(f) delete f 63#define FONT_UNREF(f) delete f
67 64
68struct rxvt_fallback_font; 65struct rxvt_fallback_font;
69 66
70struct rxvt_fontset { 67struct rxvt_fontset {
71 rxvt_fontset (pR); 68 rxvt_fontset (rxvt_t r);
72 ~rxvt_fontset (); 69 ~rxvt_fontset ();
73 70
74 rxvt_font *new_font (const char *name, codeset cs); 71 rxvt_font *new_font (const char *name, codeset cs);
75 72
76 void populate (const char *desc); 73 void populate (const char *desc);
85 { 82 {
86 return fonts[base_id]; 83 return fonts[base_id];
87 } 84 }
88 85
89private: 86private:
90#ifdef EXPLICIT_CONTEXT 87 rxvt_t r;
91 rxvt_t rxvt_term;
92#endif
93 simplevec<rxvt_font *> fonts; 88 simplevec<rxvt_font *> fonts;
94 const rxvt_fallback_font *fallback; 89 const rxvt_fallback_font *fallback;
95 90
96 int height; 91 int height;
97 int base_id; 92 int base_id;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines