scsh-conservatory
/
scx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed a bug in draw-image-text.

This commit is contained in:
frese 2002-02-04 12:44:08 +00:00
parent 40fcb8e61d
commit b6a026853a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
c/xlib/text.c
View File

@ -1,5 +1,6 @@
#include "xlib.h" #include "xlib.h"
#include "scheme48.h" #include "scheme48.h"
#include <stdio.h>
extern XDrawText(), XDrawText16(); extern XDrawText(), XDrawText16();
@ -10,12 +11,13 @@ extern XDrawText(), XDrawText16();
*/ */
s48_value scx_Text_Width(s48_value Xfontstruct, s48_value text, s48_value format){ s48_value scx_Text_Width(s48_value Xfontstruct, s48_value text,
s48_value format){
char* s; char* s;
XChar2b* s2; XChar2b* s2;
XFontStruct* font = SCX_EXTRACT_FONTSTRUCT(Xfontstruct); XFontStruct* font = SCX_EXTRACT_FONTSTRUCT(Xfontstruct);
int len = (int)S48_VECTOR_LENGTH(text), i, tmp; int len = (int)S48_VECTOR_LENGTH(text), i, tmp;
if (s48_extract_integer(format) == 2){ if (s48_extract_integer(format) == 1){
for (i = 0; i < len; i++){ for (i = 0; i < len; i++){
tmp = (int)s48_extract_integer(S48_VECTOR_REF(text, i)); tmp = (int)s48_extract_integer(S48_VECTOR_REF(text, i));
s2[i].byte1 = (tmp >> 8) & 0xff; s2[i].byte1 = (tmp >> 8) & 0xff;
@ -40,7 +42,7 @@ s48_value scx_Extents_Text (s48_value Xfontstruct, s48_value text,
XFontStruct* font = SCX_EXTRACT_FONTSTRUCT(Xfontstruct); XFontStruct* font = SCX_EXTRACT_FONTSTRUCT(Xfontstruct);
XCharStruct CI; XCharStruct CI;
int len = (int)S48_VECTOR_LENGTH(text), i, tmp, dir, fasc, fdesc; int len = (int)S48_VECTOR_LENGTH(text), i, tmp, dir, fasc, fdesc;
if (s48_extract_integer(format) == 2){ if (s48_extract_integer(format) == 1){
for (i = 0; i < len; i++){ for (i = 0; i < len; i++){
tmp = (int)s48_extract_integer(S48_VECTOR_REF(text, i)); tmp = (int)s48_extract_integer(S48_VECTOR_REF(text, i));
s2[i].byte1 = (tmp >> 8) & 0xff; s2[i].byte1 = (tmp >> 8) & 0xff;

1
scheme/xlib/text.scm
View File

@ -101,6 +101,7 @@
(define (extents-intern id) (define (extents-intern id)
(lambda (font text . format) (lambda (font text . format)
(display "-----------------\n")
(let ((format (if (null? format) '1-byte (car format)))) (let ((format (if (null? format) '1-byte (car format))))
(%extents-text (font-Xfontstruct font) (%extents-text (font-Xfontstruct font)
(text->internal-text text format) (text->internal-text text format)