Mercurial > emacs
view src/nsgui.h @ 106085:cd4cbab8bb21
Handle system default font and changing font parameters.
* xterm.h (struct x_display_info): Add atoms and Window for xsettings.
* xterm.c (handle_one_xevent): Call xft_settings_event for
ClientMessage, PropertyNotify and DestroyNotify.
(x_term_init): If we have XFT, get DPI from Xft.dpi.
Call xsettings_initialize.
* xftfont.c (xftfont_fix_match): New function.
(xftfont_open): Call XftDefaultSubstitute before XftFontMatch.
Call xftfont_fix_match after XftFontMatch.
* xfont.c (xfont_driver): Initialize all members.
* xfns.c (x_default_font_parameter): Try font from Ffont_get_system_font.
Do not get font from x_default_parameter if we got one from
Ffont_get_system_font.
(Fx_select_font): Get the defaut font name from :name of FRAME_FONT (f).
* w32font.c (w32font_driver): Initialize all members.
* termhooks.h (enum event_kind): CONFIG_CHANGED_EVENT is new.
* lisp.h: Declare syms_of_xsettings.
* keyboard.c (kbd_buffer_get_event, make_lispy_event): Handle
CONFIG_CHANGED_EVENT.
* ftfont.c (ftfont_filter_properties): New function.
* frame.c (x_set_font): Remove unused variable lval.
* font.h (struct font_driver): filter_properties is new.
* font.c (font_put_extra): Don't return if val is nil, it means
boolean option is off.
(font_parse_fcname): Collect all extra properties in extra_props
and call filter_properties for all drivers with extra_props and
font as parameter.
(font_open_entity): Do not use cache, it does not pick up new fontconfig
settings like hinting.
(font_load_for_lface): If spec had a name in it, store it in entity.
* emacs.c (main): Call syms_of_xsettings
* config.in: HAVE_GCONF is new.
* Makefile.in (GCONF_CFLAGS, GCONF_LIBS): New variables for HAVE_GCONF.
xsettings.o is new.
* menu-bar.el: Put "Use system font" in Option-menu.
* loadup.el: If feature system-font-setting or font-render-setting is
there, load font-setting.
* Makefile.in (ELCFILES): font-settings.el is new.
* font-setting.el: New file.
* NEWS: Mention dynamic font changes (font-use-system-font).
* configure.in: New option: --with(out)-gconf.
Set HAVE_GCONF if we find gconf.
| author | Jan Dj?rv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 17 Nov 2009 08:21:23 +0000 |
| parents | 963474e6d53e |
| children | 1d1d5d9bd884 |
line wrap: on
line source
/* Definitions and headers for communication on the NeXT/Open/GNUstep API. Copyright (C) 1995, 2005, 2008, 2009 Free Software Foundation, Inc. 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/>. */ #ifndef __NSGUI_H__ #define __NSGUI_H__ /* this gets included from a couple of the plain (non-NS) .c files */ #ifdef __OBJC__ #ifdef NS_IMPL_COCOA #ifdef Z #warning "Z is defined. If you get a later parse error in a header, check that buffer.h or other files #define-ing Z are not included." #endif /* Z */ #define Cursor FooFoo #undef init_process #endif /* NS_IMPL_COCOA */ #import <AppKit/AppKit.h> #ifdef NS_IMPL_COCOA #undef Cursor #define init_process emacs_init_process #endif /* NS_IMPL_COCOA */ #import <Foundation/NSDistantObject.h> #ifdef NS_IMPL_COCOA #include <AvailabilityMacros.h> #endif /* NS_IMPL_COCOA */ #endif /* __OBJC__ */ /* menu-related */ #define free_widget_value(wv) xfree (wv) #define malloc_widget_value() ((widget_value *) memset (xmalloc \ (sizeof (widget_value)), 0, sizeof (widget_value))) /* Emulate XCharStruct. */ typedef struct _XCharStruct { int rbearing; int lbearing; int width; int ascent; int descent; } XCharStruct; /* Fake tructure from Xlib.h to represent two-byte characters. */ #ifndef __OBJC__ typedef unsigned short unichar; #endif typedef unichar XChar2b; #define STORE_XCHAR2B(chp, b1, b2) \ (*(chp) = ((XChar2b)((((b1) & 0x00ff) << 8) | ((b2) & 0x00ff)))) #define XCHAR2B_BYTE1(chp) \ (((*chp) & 0xff00) >> 8) #define XCHAR2B_BYTE2(chp) \ ((*chp) & 0x00ff) /* XXX: xfaces requires these structures, but the question is are we forced to use them? */ typedef struct _XGCValues { unsigned long foreground; unsigned long background; #ifdef __OBJC__ struct ns_font *font; #else void *font; #endif } XGCValues; typedef XGCValues * GC; #define GCForeground 0x01 #define GCBackground 0x02 #define GCFont 0x03 #ifdef __OBJC__ typedef id Pixmap; #else typedef void *Pixmap; #endif #ifdef __OBJC__ typedef NSCursor * Cursor; #else typedef void *Cursor; #endif #define No_Cursor (0) #ifdef __OBJC__ typedef NSColor * Color; #else typedef void * Color; #endif typedef int Window; typedef int Display; /* Xism */ typedef Lisp_Object XrmDatabase; /* some sort of attempt to normalize rectangle handling.. seems a bit much for what is accomplished */ typedef struct { int x, y; unsigned width, height; } XRectangle; #ifndef __OBJC__ #if defined(__LP64__) && __LP64__ typedef double CGFloat; #else typedef float CGFloat; #endif typedef struct _NSPoint { CGFloat x, y; } NSPoint; typedef struct _NSSize { CGFloat width, height; } NSSize; typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect; #endif /* NOT OBJC */ #define NativeRectangle NSRect #define CONVERT_TO_XRECT(xr, nr) \ ((xr).x = (nr).origin.x, \ (xr).y = (nr).origin.y, \ (xr).width = (nr).size.width, \ (xr).height = (nr).size.height) #define CONVERT_FROM_XRECT(xr, nr) \ ((nr).origin.x = (xr).x, \ (nr).origin.y = (xr).y, \ (nr).size.width = (xr).width, \ (nr).size.height = (xr).height) #define STORE_NATIVE_RECT(nr, px, py, pwidth, pheight) \ ((nr).origin.x = (px), \ (nr).origin.y = (py), \ (nr).size.width = (pwidth), \ (nr).size.height = (pheight)) /* This stuff needed by frame.c. */ #define ForgetGravity 0 #define NorthWestGravity 1 #define NorthGravity 2 #define NorthEastGravity 3 #define WestGravity 4 #define CenterGravity 5 #define EastGravity 6 #define SouthWestGravity 7 #define SouthGravity 8 #define SouthEastGravity 9 #define StaticGravity 10 #define NoValue 0x0000 #define XValue 0x0001 #define YValue 0x0002 #define WidthValue 0x0004 #define HeightValue 0x0008 #define AllValues 0x000F #define XNegative 0x0010 #define YNegative 0x0020 #define USPosition (1L << 0) /* user specified x, y */ #define USSize (1L << 1) /* user specified width, height */ #define PPosition (1L << 2) /* program specified position */ #define PSize (1L << 3) /* program specified size */ #define PMinSize (1L << 4) /* program specified minimum size */ #define PMaxSize (1L << 5) /* program specified maximum size */ #define PResizeInc (1L << 6) /* program specified resize increments */ #define PAspect (1L << 7) /* program specified min, max aspect ratios */ #define PBaseSize (1L << 8) /* program specified base for incrementing */ #define PWinGravity (1L << 9) /* program specified window gravity */ #endif /* __NSGUI_H__ */ /* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55 (do not change this comment) */
