mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-16 16:20:40 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
366 lines
9.1 KiB
C
366 lines
9.1 KiB
C
/* ftxfont.c -- FreeType font driver on X (without using XFT).
|
||
Copyright (C) 2006-2015 Free Software Foundation, Inc.
|
||
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
|
||
National Institute of Advanced Industrial Science and Technology (AIST)
|
||
Registration Number H13PRO009
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs is free software: you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation, either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
GNU Emacs is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include <config.h>
|
||
#include <stdio.h>
|
||
#include <X11/Xlib.h>
|
||
|
||
#include "lisp.h"
|
||
#include "dispextern.h"
|
||
#include "xterm.h"
|
||
#include "frame.h"
|
||
#include "blockinput.h"
|
||
#include "character.h"
|
||
#include "charset.h"
|
||
#include "fontset.h"
|
||
#include "font.h"
|
||
|
||
/* FTX font driver. */
|
||
|
||
struct font_driver ftxfont_driver;
|
||
|
||
struct ftxfont_frame_data
|
||
{
|
||
/* Background and foreground colors. */
|
||
XColor colors[2];
|
||
/* GCs interpolating the above colors. gcs[0] is for a color
|
||
closest to BACKGROUND, and gcs[5] is for a color closest to
|
||
FOREGROUND. */
|
||
GC gcs[6];
|
||
struct ftxfont_frame_data *next;
|
||
};
|
||
|
||
|
||
/* Return an array of 6 GCs for antialiasing. */
|
||
|
||
static GC *
|
||
ftxfont_get_gcs (struct frame *f, unsigned long foreground, unsigned long background)
|
||
{
|
||
XColor color;
|
||
XGCValues xgcv;
|
||
int i;
|
||
struct ftxfont_frame_data *data = font_get_frame_data (f, Qftx);
|
||
struct ftxfont_frame_data *prev = NULL, *this = NULL, *new;
|
||
|
||
if (data)
|
||
{
|
||
for (this = data; this; prev = this, this = this->next)
|
||
{
|
||
if (this->colors[0].pixel < background)
|
||
continue;
|
||
if (this->colors[0].pixel > background)
|
||
break;
|
||
if (this->colors[1].pixel < foreground)
|
||
continue;
|
||
if (this->colors[1].pixel > foreground)
|
||
break;
|
||
return this->gcs;
|
||
}
|
||
}
|
||
|
||
new = xmalloc (sizeof *new);
|
||
new->next = this;
|
||
if (prev)
|
||
prev->next = new;
|
||
font_put_frame_data (f, Qftx, new);
|
||
|
||
new->colors[0].pixel = background;
|
||
new->colors[1].pixel = foreground;
|
||
|
||
block_input ();
|
||
XQueryColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), new->colors, 2);
|
||
for (i = 1; i < 7; i++)
|
||
{
|
||
/* Interpolate colors linearly. Any better algorithm? */
|
||
color.red
|
||
= (new->colors[1].red * i + new->colors[0].red * (8 - i)) / 8;
|
||
color.green
|
||
= (new->colors[1].green * i + new->colors[0].green * (8 - i)) / 8;
|
||
color.blue
|
||
= (new->colors[1].blue * i + new->colors[0].blue * (8 - i)) / 8;
|
||
if (! x_alloc_nearest_color (f, FRAME_X_COLORMAP (f), &color))
|
||
break;
|
||
xgcv.foreground = color.pixel;
|
||
new->gcs[i - 1] = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
GCForeground, &xgcv);
|
||
}
|
||
unblock_input ();
|
||
|
||
if (i < 7)
|
||
{
|
||
block_input ();
|
||
for (i--; i >= 0; i--)
|
||
XFreeGC (FRAME_X_DISPLAY (f), new->gcs[i]);
|
||
unblock_input ();
|
||
if (prev)
|
||
prev->next = new->next;
|
||
else if (data)
|
||
font_put_frame_data (f, Qftx, new->next);
|
||
xfree (new);
|
||
return NULL;
|
||
}
|
||
return new->gcs;
|
||
}
|
||
|
||
static int
|
||
ftxfont_draw_bitmap (struct frame *f, GC gc_fore, GC *gcs, struct font *font,
|
||
unsigned int code, int x, int y, XPoint *p, int size,
|
||
int *n, bool flush)
|
||
{
|
||
struct font_bitmap bitmap;
|
||
unsigned char *b;
|
||
int i, j;
|
||
|
||
if (ftfont_driver.get_bitmap (font, code, &bitmap, size > 0x100 ? 1 : 8) < 0)
|
||
return 0;
|
||
if (size > 0x100)
|
||
{
|
||
for (i = 0, b = bitmap.buffer; i < bitmap.rows;
|
||
i++, b += bitmap.pitch)
|
||
{
|
||
for (j = 0; j < bitmap.width; j++)
|
||
if (b[j / 8] & (1 << (7 - (j % 8))))
|
||
{
|
||
p[n[0]].x = x + bitmap.left + j;
|
||
p[n[0]].y = y - bitmap.top + i;
|
||
if (++n[0] == size)
|
||
{
|
||
XDrawPoints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
gc_fore, p, size, CoordModeOrigin);
|
||
n[0] = 0;
|
||
}
|
||
}
|
||
}
|
||
if (flush && n[0] > 0)
|
||
XDrawPoints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
gc_fore, p, n[0], CoordModeOrigin);
|
||
}
|
||
else
|
||
{
|
||
for (i = 0, b = bitmap.buffer; i < bitmap.rows;
|
||
i++, b += bitmap.pitch)
|
||
{
|
||
for (j = 0; j < bitmap.width; j++)
|
||
{
|
||
int idx = (bitmap.bits_per_pixel == 1
|
||
? ((b[j / 8] & (1 << (7 - (j % 8)))) ? 6 : -1)
|
||
: (b[j] >> 5) - 1);
|
||
|
||
if (idx >= 0)
|
||
{
|
||
XPoint *pp = p + size * idx;
|
||
|
||
pp[n[idx]].x = x + bitmap.left + j;
|
||
pp[n[idx]].y = y - bitmap.top + i;
|
||
if (++(n[idx]) == size)
|
||
{
|
||
XDrawPoints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
idx == 6 ? gc_fore : gcs[idx], pp, size,
|
||
CoordModeOrigin);
|
||
n[idx] = 0;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
if (flush)
|
||
{
|
||
for (i = 0; i < 6; i++)
|
||
if (n[i] > 0)
|
||
XDrawPoints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
gcs[i], p + 0x100 * i, n[i], CoordModeOrigin);
|
||
if (n[6] > 0)
|
||
XDrawPoints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
|
||
gc_fore, p + 0x600, n[6], CoordModeOrigin);
|
||
}
|
||
}
|
||
|
||
if (ftfont_driver.free_bitmap)
|
||
ftfont_driver.free_bitmap (font, &bitmap);
|
||
|
||
return bitmap.advance;
|
||
}
|
||
|
||
static void
|
||
ftxfont_draw_background (struct frame *f, struct font *font, GC gc, int x, int y,
|
||
int width)
|
||
{
|
||
XGCValues xgcv;
|
||
|
||
XGetGCValues (FRAME_X_DISPLAY (f), gc,
|
||
GCForeground | GCBackground, &xgcv);
|
||
XSetForeground (FRAME_X_DISPLAY (f), gc, xgcv.background);
|
||
XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc,
|
||
x, y - FONT_BASE (font), width, FONT_HEIGHT (font));
|
||
XSetForeground (FRAME_X_DISPLAY (f), gc, xgcv.foreground);
|
||
}
|
||
|
||
static Lisp_Object
|
||
ftxfont_list (struct frame *f, Lisp_Object spec)
|
||
{
|
||
Lisp_Object list = ftfont_driver.list (f, spec), tail;
|
||
|
||
for (tail = list; CONSP (tail); tail = XCDR (tail))
|
||
ASET (XCAR (tail), FONT_TYPE_INDEX, Qftx);
|
||
return list;
|
||
}
|
||
|
||
static Lisp_Object
|
||
ftxfont_match (struct frame *f, Lisp_Object spec)
|
||
{
|
||
Lisp_Object entity = ftfont_driver.match (f, spec);
|
||
|
||
if (VECTORP (entity))
|
||
ASET (entity, FONT_TYPE_INDEX, Qftx);
|
||
return entity;
|
||
}
|
||
|
||
static Lisp_Object
|
||
ftxfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
|
||
{
|
||
Lisp_Object font_object;
|
||
struct font *font;
|
||
|
||
font_object = ftfont_driver.open (f, entity, pixel_size);
|
||
if (NILP (font_object))
|
||
return Qnil;
|
||
font = XFONT_OBJECT (font_object);
|
||
font->driver = &ftxfont_driver;
|
||
return font_object;
|
||
}
|
||
|
||
static void
|
||
ftxfont_close (struct font *font)
|
||
{
|
||
ftfont_driver.close (font);
|
||
}
|
||
|
||
static int
|
||
ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y,
|
||
bool with_background)
|
||
{
|
||
struct frame *f = s->f;
|
||
struct face *face = s->face;
|
||
struct font *font = s->font;
|
||
XPoint p[0x700];
|
||
int n[7];
|
||
unsigned *code;
|
||
int len = to - from;
|
||
int i;
|
||
GC *gcs;
|
||
int xadvance;
|
||
|
||
n[0] = n[1] = n[2] = n[3] = n[4] = n[5] = n[6] = 0;
|
||
|
||
USE_SAFE_ALLOCA;
|
||
SAFE_NALLOCA (code, 1, len);
|
||
block_input ();
|
||
if (with_background)
|
||
ftxfont_draw_background (f, font, s->gc, x, y, s->width);
|
||
for (i = 0; i < len; i++)
|
||
code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8)
|
||
| XCHAR2B_BYTE2 (s->char2b + from + i));
|
||
|
||
if (face->gc == s->gc)
|
||
{
|
||
gcs = ftxfont_get_gcs (f, face->foreground, face->background);
|
||
}
|
||
else
|
||
{
|
||
XGCValues xgcv;
|
||
unsigned long mask = GCForeground | GCBackground;
|
||
|
||
XGetGCValues (FRAME_X_DISPLAY (f), s->gc, mask, &xgcv);
|
||
gcs = ftxfont_get_gcs (f, xgcv.foreground, xgcv.background);
|
||
}
|
||
|
||
if (gcs)
|
||
{
|
||
if (s->num_clips)
|
||
for (i = 0; i < 6; i++)
|
||
XSetClipRectangles (FRAME_X_DISPLAY (f), gcs[i], 0, 0,
|
||
s->clip, s->num_clips, Unsorted);
|
||
|
||
for (i = 0; i < len; i++)
|
||
{
|
||
xadvance = ftxfont_draw_bitmap (f, s->gc, gcs, font, code[i], x, y,
|
||
p, 0x100, n, i + 1 == len);
|
||
x += (s->padding_p ? 1 : xadvance);
|
||
}
|
||
if (s->num_clips)
|
||
for (i = 0; i < 6; i++)
|
||
XSetClipMask (FRAME_X_DISPLAY (f), gcs[i], None);
|
||
}
|
||
else
|
||
{
|
||
/* We can't draw with antialiasing.
|
||
s->gc should already have a proper clipping setting. */
|
||
for (i = 0; i < len; i++)
|
||
{
|
||
xadvance = ftxfont_draw_bitmap (f, s->gc, NULL, font, code[i], x, y,
|
||
p, 0x700, n, i + 1 == len);
|
||
x += (s->padding_p ? 1 : xadvance);
|
||
}
|
||
}
|
||
|
||
unblock_input ();
|
||
SAFE_FREE ();
|
||
|
||
return len;
|
||
}
|
||
|
||
static int
|
||
ftxfont_end_for_frame (struct frame *f)
|
||
{
|
||
struct ftxfont_frame_data *data = font_get_frame_data (f, Qftx);
|
||
|
||
block_input ();
|
||
while (data)
|
||
{
|
||
struct ftxfont_frame_data *next = data->next;
|
||
int i;
|
||
|
||
for (i = 0; i < 6; i++)
|
||
XFreeGC (FRAME_X_DISPLAY (f), data->gcs[i]);
|
||
xfree (data);
|
||
data = next;
|
||
}
|
||
unblock_input ();
|
||
font_put_frame_data (f, Qftx, NULL);
|
||
return 0;
|
||
}
|
||
|
||
|
||
|
||
void
|
||
syms_of_ftxfont (void)
|
||
{
|
||
DEFSYM (Qftx, "ftx");
|
||
|
||
ftxfont_driver = ftfont_driver;
|
||
ftxfont_driver.type = Qftx;
|
||
ftxfont_driver.list = ftxfont_list;
|
||
ftxfont_driver.match = ftxfont_match;
|
||
ftxfont_driver.open = ftxfont_open;
|
||
ftxfont_driver.close = ftxfont_close;
|
||
ftxfont_driver.draw = ftxfont_draw;
|
||
ftxfont_driver.end_for_frame = ftxfont_end_for_frame;
|
||
register_font_driver (&ftxfont_driver, NULL);
|
||
}
|