ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.h (file contents):
Revision 1.21 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.24 by ayin, Thu Oct 18 09:11:43 2007 UTC

2#define DEFAULTFONT_H_ 2#define DEFAULTFONT_H_
3 3
4#include <X11/Xlib.h> 4#include <X11/Xlib.h>
5#if XFT 5#if XFT
6# include <X11/Xft/Xft.h> 6# include <X11/Xft/Xft.h>
7#endif
8
9#ifdef HAVE_XSETLOCALE
10# define X_LOCALE
11# include <X11/Xlocale.h>
12#else
13# ifdef HAVE_SETLOCALE
14# include <clocale>
15# endif
16#endif /* HAVE_XLOCALE */
17
18#ifdef HAVE_NL_LANGINFO
19# include <langinfo.h>
20#endif 7#endif
21 8
22#include <inttypes.h> 9#include <inttypes.h>
23 10
24#include "feature.h" 11#include "feature.h"
60 47
61 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const; 48 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
62 49
63 virtual rxvt_fontprop properties () = 0; 50 virtual rxvt_fontprop properties () = 0;
64 51
65 virtual bool load (const rxvt_fontprop &morph) = 0; 52 virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
66 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0; 53 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
67 54
68 virtual void draw (rxvt_drawable &d, 55 virtual void draw (rxvt_drawable &d,
69 int x, int y, 56 int x, int y,
70 const text_t *text, int len, 57 const text_t *text, int len,
80 67
81 rxvt_fontset (rxvt_term *term); 68 rxvt_fontset (rxvt_term *term);
82 ~rxvt_fontset (); 69 ~rxvt_fontset ();
83 70
84 bool populate (const char *desc); 71 bool populate (const char *desc);
85 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 72 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
86 int find_font (uint32_t unicode); 73 int find_font (uint32_t unicode);
87 int find_font (const char *name) const; 74 int find_font (const char *name) const;
88 bool realize_font (int i); 75 bool realize_font (int i);
89 76
90 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 77 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
94 } 81 }
95 82
96private: 83private:
97 rxvt_term *term; 84 rxvt_term *term;
98 rxvt_fontprop prop; 85 rxvt_fontprop prop;
86 bool force_prop;
99 simplevec<rxvt_font *> fonts; 87 simplevec<rxvt_font *> fonts;
100 const rxvt_fallback_font *fallback; 88 const rxvt_fallback_font *fallback;
101 89
102 typedef unsigned char pagemap[256]; 90 typedef unsigned char pagemap[256];
103 vector<pagemap *> fmap; 91 vector<pagemap *> fmap;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines