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.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.20 by root, Wed Aug 4 03:29:28 2004 UTC

1/* 1#ifndef DEFAULTFONT_H_
2 * $Id: defaultfont.h,v 1.7 2003/12/18 04:14:30 pcg Exp $ 2#define DEFAULTFONT_H_
3 */
4 3
5#ifndef _DEFAULTFONT_H_ 4#include <X11/Xlib.h>
6#define _DEFAULTFONT_H_ 5#if XFT
6# include <X11/Xft/Xft.h>
7#endif
7 8
8#ifdef HAVE_XSETLOCALE 9#ifdef HAVE_XSETLOCALE
9# define X_LOCALE 10# define X_LOCALE
10# include <X11/Xlocale.h> 11# include <X11/Xlocale.h>
11#else 12#else
12# ifdef HAVE_SETLOCALE 13# ifdef HAVE_SETLOCALE
13# include <locale.h> 14# include <clocale>
14# endif 15# endif
15#endif /* HAVE_XLOCALE */ 16#endif /* HAVE_XLOCALE */
16 17
17#ifdef HAVE_NL_LANGINFO 18#ifdef HAVE_NL_LANGINFO
18# include <langinfo.h> 19# include <langinfo.h>
19#endif 20#endif
20 21
22#include <inttypes.h>
23
21#include "rxvtlib.h" 24#include "rxvtlib.h"
22#include "feature.h" 25#include "feature.h"
23#include "encoding.h" 26#include "encoding.h"
24#include "rxvtvec.h" 27#include "rxvtstl.h"
25 28
26struct rxvt_fontprop { 29struct rxvt_fontprop {
27 enum { 30 enum {
28 medium = 100, bold = 200, 31 medium = 100, bold = 200,
29 roman = 0, italic = 100, 32 roman = 0, italic = 100,
30 }; 33 };
31 int height; 34 int width, height;
32 int weight; 35 int weight, slant;
33 int slant; 36};
37
38struct rxvt_drawable {
39 rxvt_display *display;
40 Drawable drawable;
41#if XFT
42 XftDraw *xftdrawable;
43 operator XftDraw *();
44#endif
45
46 rxvt_drawable (rxvt_display *display, Drawable drawable)
47 : display(display),
48#if XFT
49 xftdrawable(0),
50#endif
51 drawable(drawable)
52 { }
53
54#if XFT
55 ~rxvt_drawable ();
56#endif
57
58 operator Drawable() { return drawable; }
34}; 59};
35 60
36struct rxvt_font { 61struct rxvt_font {
62 struct rxvt_fontset *fs;
37 // managed by the fontset 63 // managed by the fontset
38 rxvt_t r; 64 rxvt_t r;
39 void set_term (rxvt_t r) { this->r = r; } 65 void set_term (rxvt_t r) { this->r = r; }
40 66
41 char *name; 67 char *name;
… …
52 if (this->name) free (this->name); // let the compiler optimize 78 if (this->name) free (this->name); // let the compiler optimize
53 this->name = name; 79 this->name = name;
54 } 80 }
55 81
56 rxvt_font () { name = 0; } 82 rxvt_font () { name = 0; }
57 ~rxvt_font () { free (name); clear (); }; 83 ~rxvt_font () { free (name); };
58 84
59 void clear_rect (int x, int y, int w, int h, int color); 85 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color);
60 86
61 virtual void clear () { }; 87 virtual void clear () { };
62 88
63 virtual rxvt_fontprop properties () = 0; 89 virtual rxvt_fontprop properties () = 0;
64 90
65 virtual bool load (const rxvt_fontprop &prop) = 0; 91 virtual bool load (const rxvt_fontprop &prop) = 0;
66 virtual bool has_codepoint (uint32_t unicode) = 0; 92 virtual bool has_codepoint (uint32_t unicode) = 0;
67 93
68 virtual void draw (int x, int y, 94 virtual void draw (rxvt_drawable &d,
95 int x, int y,
69 const text_t *text, int len, 96 const text_t *text, int len,
70 int fg, int bg) = 0; 97 int fg, int bg) = 0;
71}; 98};
72 99
73//#define FONT_REF(obj) (obj)->refcnt++ 100#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
74//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
75#define FONT_UNREF(f) delete f
76 101
77struct rxvt_fallback_font; 102struct rxvt_fallback_font;
78 103
79struct rxvt_fontset { 104struct rxvt_fontset {
105 char *fontdesc;
106
80 rxvt_fontset (rxvt_t r); 107 rxvt_fontset (rxvt_t r);
81 ~rxvt_fontset (); 108 ~rxvt_fontset ();
82 109
83 rxvt_font *new_font (const char *name, codeset cs); 110 rxvt_font *new_font (const char *name, codeset cs);
84 111
85 void populate (const char *desc); 112 bool populate (const char *desc);
86 int find_font (uint32_t unicode); 113 int find_font (uint32_t unicode, bool bold = false);
87 114
115 // font-id's MUST fit into a signed 16 bit integer.
88 rxvt_font *operator [](int id) const 116 rxvt_font *operator [] (int id) const
89 { 117 {
90 return fonts[id]; 118 return fonts[id];
91 } 119 }
92 120
93 rxvt_font *base_font () const 121 rxvt_font *base_font () const

Diff Legend

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