Blame

Date:
Message:
libdraw: redo default font construction to be hidpi-safe If $font is not set, the default font is constructed from font data linked into every libdraw binary. That process was different from the usual openfont code, and so it was not hidpi-aware, resulting in very tiny fonts out of the box on hidpi systems, until users set $font. Fix this by using openfont to construct the default font, by recognizing the name *default* when looking for font and subfont file contents. Then all the hidpi scaling applies automatically. As a side effect, the concept of a 'default subfont' is gone, as are display->defaultsubfont, getdefont, and memgetdefont.
Actions:
History | Blob | Raw File
 1 76193d7c 2003-09-30 devnull #include <u.h>

 2 76193d7c 2003-09-30 devnull #include <libc.h>

 3 76193d7c 2003-09-30 devnull #include <draw.h>

 4 76193d7c 2003-09-30 devnull 

 5 76193d7c 2003-09-30 devnull Subfont*

 6 76193d7c 2003-09-30 devnull readsubfonti(Display*d, char *name, int fd, Image *ai, int dolock)

 7 76193d7c 2003-09-30 devnull {

 8 76193d7c 2003-09-30 devnull 	char hdr[3*12+4+1];

 9 76193d7c 2003-09-30 devnull 	int n;

10 76193d7c 2003-09-30 devnull 	uchar *p;

11 76193d7c 2003-09-30 devnull 	Fontchar *fc;

12 76193d7c 2003-09-30 devnull 	Subfont *f;

13 76193d7c 2003-09-30 devnull 	Image *i;

14 76193d7c 2003-09-30 devnull 

15 76193d7c 2003-09-30 devnull 	i = ai;

16 76193d7c 2003-09-30 devnull 	if(i == nil){

17 76193d7c 2003-09-30 devnull 		i = readimage(d, fd, dolock);

18 76193d7c 2003-09-30 devnull 		if(i == nil)

19 76193d7c 2003-09-30 devnull 			return nil;

20 76193d7c 2003-09-30 devnull 	}

21 76193d7c 2003-09-30 devnull 	if(read(fd, hdr, 3*12) != 3*12){

22 76193d7c 2003-09-30 devnull 		if(ai == nil)

23 76193d7c 2003-09-30 devnull 			freeimage(i);

24 76193d7c 2003-09-30 devnull 		werrstr("rdsubfonfile: header read error: %r");

25 76193d7c 2003-09-30 devnull 		return nil;

26 76193d7c 2003-09-30 devnull 	}

27 76193d7c 2003-09-30 devnull 	n = atoi(hdr);

28 76193d7c 2003-09-30 devnull 	p = malloc(6*(n+1));

29 76193d7c 2003-09-30 devnull 	if(p == nil)

30 4e206880 2004-04-25 devnull 		goto Err;

31 76193d7c 2003-09-30 devnull 	if(read(fd, p, 6*(n+1)) != 6*(n+1)){

32 76193d7c 2003-09-30 devnull 		werrstr("rdsubfonfile: fontchar read error: %r");

33 76193d7c 2003-09-30 devnull     Err:

34 4e206880 2004-04-25 devnull 		if(ai == nil)

35 4e206880 2004-04-25 devnull 			freeimage(i);

36 76193d7c 2003-09-30 devnull 		free(p);

37 76193d7c 2003-09-30 devnull 		return nil;

38 76193d7c 2003-09-30 devnull 	}

39 76193d7c 2003-09-30 devnull 	fc = malloc(sizeof(Fontchar)*(n+1));

40 76193d7c 2003-09-30 devnull 	if(fc == nil)

41 76193d7c 2003-09-30 devnull 		goto Err;

42 76193d7c 2003-09-30 devnull 	_unpackinfo(fc, p, n);

43 76193d7c 2003-09-30 devnull 	if(dolock)

44 76193d7c 2003-09-30 devnull 		lockdisplay(d);

45 76193d7c 2003-09-30 devnull 	f = allocsubfont(name, n, atoi(hdr+12), atoi(hdr+24), fc, i);

46 76193d7c 2003-09-30 devnull 	if(dolock)

47 76193d7c 2003-09-30 devnull 		unlockdisplay(d);

48 76193d7c 2003-09-30 devnull 	if(f == nil){

49 76193d7c 2003-09-30 devnull 		free(fc);

50 76193d7c 2003-09-30 devnull 		goto Err;

51 76193d7c 2003-09-30 devnull 	}

52 76193d7c 2003-09-30 devnull 	free(p);

53 76193d7c 2003-09-30 devnull 	return f;

54 76193d7c 2003-09-30 devnull }

55 76193d7c 2003-09-30 devnull 

56 76193d7c 2003-09-30 devnull Subfont*

57 76193d7c 2003-09-30 devnull readsubfont(Display*d, char *name, int fd, int dolock)

58 76193d7c 2003-09-30 devnull {

59 76193d7c 2003-09-30 devnull 	return readsubfonti(d, name, fd, nil, dolock);

60 76193d7c 2003-09-30 devnull }

61 16d00819 2018-11-16 rsc 

62 16d00819 2018-11-16 rsc void

63 16d00819 2018-11-16 rsc _unpackinfo(Fontchar *fc, uchar *p, int n)

64 16d00819 2018-11-16 rsc {

65 16d00819 2018-11-16 rsc 	int j;

66 16d00819 2018-11-16 rsc 

67 16d00819 2018-11-16 rsc 	for(j=0;  j<=n;  j++){

68 16d00819 2018-11-16 rsc 		fc->x = p[0]|(p[1]<<8);

69 16d00819 2018-11-16 rsc 		fc->top = p[2];

70 16d00819 2018-11-16 rsc 		fc->bottom = p[3];

71 16d00819 2018-11-16 rsc 		fc->left = p[4];

72 16d00819 2018-11-16 rsc 		fc->width = p[5];

73 16d00819 2018-11-16 rsc 		fc++;

74 16d00819 2018-11-16 rsc 		p += 6;

75 16d00819 2018-11-16 rsc 	}

76 16d00819 2018-11-16 rsc }