Mercurial > hg > xemacs-beta
annotate nt/xpm.mak @ 5617:b0d712bbc2a6
The "flush" face property.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2011-12-23 Didier Verna <didier@xemacs.org>
* faces.h (struct Lisp_Face): New 'flush slot.
* faces.h (struct face_cachel): New 'flush and 'flush_specified
flags.
* faces.h (WINDOW_FACE_CACHEL_FLUSH_P):
* faces.h (FACE_FLUSH_P): New macros.
* faces.c: Declare Qflush.
* lisp.h: Externalize it.
* faces.c (syms_of_faces): Define it.
* faces.c (vars_of_faces): Update built-in face specifiers.
* faces.c (complex_vars_of_faces): Update specifier fallbacks.
* faces.c (mark_face):
* faces.c (face_equal):
* faces.c (face_getprop):
* faces.c (face_putprop):
* faces.c (face_remprop):
* faces.c (face_plist):
* faces.c (reset_face):
* faces.c (update_face_inheritance_mapper):
* faces.c (Fmake_face):
* faces.c (update_face_cachel_data):
* faces.c (merge_face_cachel_data):
* faces.c (Fcopy_face):
* fontcolor.c (face_boolean_validate): Handle the flush property.
* redisplay.h (struct display_line): Rename 'default_findex slot to
clearer name 'clear_findex.
* redisplay.h (DISPLAY_LINE_INIT): Update accordingly.
* redisplay-output.c (compare_display_blocks):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_output_window):
* redisplay.c (regenerate_window_extents_only_changed):
* redisplay.c (regenerate_window_incrementally): Update the
comparison tests between the current and desired display lines to
cope for different 'clear_findex values.
* redisplay.c (create_text_block): Initialize the display line's
'clear_findex slot to DEFAULT_INDEX. Record a new 'clear_findex
value when we encounter a newline character displayed in a flushed
face.
* redisplay.c (create_string_text_block): Record a new
'clear_findex value when we encounter a newline character
displayed in a flushed face.
lisp/ChangeLog addition:
2011-12-23 Didier Verna <didier@xemacs.org>
* cl-macs.el (face-flush-p): New defsetf.
* faces.el (set-face-property): Document the flush property.
* faces.el (face-flush-p): New function.
* faces.el (set-face-flush-p): New function.
* faces.el (face-equal):
* cus-face.el (custom-face-attributes):
* x-faces.el (x-init-face-from-resources):
* x-faces.el (make-face-x-resource-internal): Handle the flush
property.
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Fri, 23 Dec 2011 10:56:16 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 276 | 1 # |
| 2 # XPM Makefile for Microsoft NMAKE without X libraries | |
| 3 # | |
|
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
4 # Copyright (C) 1997 Free Software Foundation, Inc. |
|
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
5 # |
|
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
6 # This file is part of XEmacs. |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
7 # |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
8 # XEmacs is free software: you can redistribute it and/or modify it |
|
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
9 # under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
10 # Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
11 # option) any later version. |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
12 # |
|
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
13 # XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
14 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
15 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
16 # for more details. |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
17 # |
|
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
18 # You should have received a copy of the GNU General Public License |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5231
diff
changeset
|
19 # along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
|
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
20 # |
| 398 | 21 !if !defined(DEBUG) |
| 22 !if defined(DEBUG_XEMACS) | |
| 23 DEBUG=$(DEBUG_XEMACS) | |
| 24 !else | |
| 25 DEBUG=0 | |
| 26 !endif | |
| 27 !endif | |
| 276 | 28 |
| 398 | 29 !if !defined(USE_CRTDLL) |
| 817 | 30 USE_CRTDLL=1 |
| 276 | 31 !endif |
| 32 | |
| 398 | 33 !if $(DEBUG) |
| 276 | 34 OPT=-Od -Zi |
| 398 | 35 LINK_DEBUG=-debug |
| 276 | 36 !else |
| 398 | 37 OPT=-Ox |
| 38 !endif | |
| 39 | |
| 40 !if $(USE_CRTDLL) | |
| 41 !if $(DEBUG) | |
| 42 C_LIBFLAG=-MDd | |
| 43 !else | |
| 44 C_LIBFLAG=-MD | |
| 45 !endif | |
| 46 !else | |
| 47 !if $(DEBUG) | |
| 48 C_LIBFLAG=-MLd | |
| 49 !else | |
| 50 C_LIBFLAG=-ML | |
| 51 !endif | |
| 276 | 52 !endif |
| 53 | |
| 54 WARN_CPP_FLAGS = -W3 | |
| 55 | |
| 56 CC=cl | |
| 398 | 57 CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \ |
| 58 $(OPT) $(INCLUDES) -c | |
| 276 | 59 |
| 60 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \ | |
| 61 WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \ | |
| 62 CrIFrBuf.obj CrBufFrI.obj \ | |
| 63 RdFToDat.obj WrFFrDat.obj \ | |
| 64 Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \ | |
| 65 simx.obj | |
| 66 | |
| 67 # nmake rule | |
| 68 | |
| 69 .SUFFIXES: | |
| 70 .SUFFIXES: .c | |
| 71 | |
| 398 | 72 .c.obj:: |
| 73 $(CC) $(CFLAGS) $< | |
| 276 | 74 |
| 75 | |
| 76 # targets | |
| 77 | |
| 78 all: ..\X11\xpm.h Xpm.lib | |
| 79 | |
| 80 ..\X11\xpm.h: ..\X11\NUL xpm.h | |
| 81 copy xpm.h ..\X11 | |
| 82 | |
| 83 ..\X11\NUL: | |
| 84 mkdir ..\X11 | |
| 85 | |
| 86 Xpm.lib: $(OBJS) | |
| 398 | 87 lib -nologo -out:$@ $(OBJS) |