Mercurial > emacs
view src/nsgui.h @ 106168:83924fb4f59c
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild
agenda after adding new entry.
* org-datetree.el (org-datetree-find-day-create): Fix regular
expression.
* org.el (org-display-outline-path): Use a format specifier for
message, to avoid problems with heading containing `%'.
* org-agenda.el (org-agenda-hide-tags-regexp): New option.
(org-format-agenda-item): Call `org-agenda-fix-displayed-tags'.
(org-agenda-fix-displayed-tags): New function.
(org-agenda-do-context-action): Just call
`org-display-outline-path', without piping the result through
`message'.
* org-latex.el (org-export-latex-preprocess): Protect secondary
footnote references.
* org-indent.el (org-indent-initialize): Avoid empty strings as
line prefixes.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
hat checking for the mark does not throw an error.
(org-agenda-diary-entry-in-org-file): Catch the case that there is
not `day' text property in the cursor line.
* org.el (org-sort-entries-or-items): Make sure that the final
entry has a newline before doing the sorting.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Get the text
property at the beginning of the line.
* org.el (org-make-link-string): Don't allow a description with
only white space.
* org-agenda.el (org-agenda-insert-diary-strategy): New variable.
(org-agenda-insert-diary-as-top-level): New function.
(org-agenda-add-entry-to-org-agenda-diary-file): Call
`org-agenda-insert-diary-as-top-level'.
* org.el (org-occur-in-agenda-files): Make sure none of the
buffers is narrowed.
(org-activate-plain-links): Add the face property here.
(org-set-font-lock-defaults): Do not add the face to plain links,
the activator function does this.
* org-habit.el (org-is-habit-p): Add doc string.
* org-archive.el (org-archive-subtree-default-with-confirmation):
Autoload.
* org-latex.el (org-export-latex-fontify): Fix regexp to make char
after match optional (happens at the end of a line...).
* org.el (org-fontify-meta-lines-and-blocks): Apply special faces
for special blocks.
* org-faces.el (org-copy-face): Set lisp indentation.
(org-quote, org-verse): New faces.
* org-agenda.el (org-agenda-remove-date): Remove variable.
* org-freemind.el (org-freemind-escape-str-from-org): Fix encoding.
* org-html.el (org-export-as-html): Move the home/up link into
the content div.
* org.el (org-export-latex-packages-alist): Option definition
moved here from org-latex.el.
* org-html.el (org-export-html-home/up-format): Add an ID to the
up/home div.
* org-wl.el (org-wl-store-link): Handle the case that
`wl-use-petname' is set.
* org.el (org-set-effort): Improve prompt.
(org-get-outline-path): Widen to get full path.
(org-compact-display-after-subtree-move): Function removed.
2009-11-20 Eric Schulte <schulte.eric@gmail.com>
* org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
hash keys to cache and re-use images generated by the
org-exp-blocks interface to ditaa and dot.
* org.el (org-format-latex): Latex images are now saved to files
named by the sha1 hash of the latex source text avoiding
regeneration of identical images.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 20 Nov 2009 20:50:32 +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) */