Mercurial > hg > xemacs-beta
annotate src/glyphs-msw.h @ 5855:0bddb59072b6
Look for cased character classes when deciding on case-fold-search, #'isearch
lisp/ChangeLog addition:
2015-03-11 Aidan Kehoe <kehoea@parhasard.net>
* isearch-mode.el:
* isearch-mode.el (isearch-fix-case):
Use the new #'no-case-regexp-p function if treating ISEARCH-STRING
as a regular expression; otherwise, use the [[:upper:]] character
class.
* isearch-mode.el (isearch-no-upper-case-p): Removed.
* isearch-mode.el (with-caps-disable-folding): Removed.
These two haven't been used since 1998.
* occur.el (occur-1):
Use #'no-case-regexp-p here.
* replace.el (perform-replace):
Don't use #'no-upper-case-p, use #'no-case-regexp-p or
(string-match "[[:upper:]]" ...) as appropriate.
* simple.el:
* simple.el (no-upper-case-p): Removed. This did two different
things, and its secondary function (examining regular expressions)
just became much more complicated; move the regular expression
functionality to its own function, use character classes when
examining non-regular-expressions instead.
The code to look for character classes, and the design decision
that this should be done, are from GNU, thank you Stefan Monnier.
* simple.el (no-case-regexp-p): New.
Given a REGEXP, return non-nil if it has nothing to suggest an
interactive user wants a case-sensitive search.
* simple.el (with-search-caps-disable-folding):
* simple.el (with-interactive-search-caps-disable-folding):
Update both these macros to use #'no-case-regexp-p.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 11 Mar 2015 18:06:15 +0000 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
428 | 1 /* mswindows-specific glyphs and related. |
2 Copyright (C) 1998 Andy Piper | |
3 | |
4 This file is part of XEmacs. | |
5 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
826
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
428 | 7 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:
826
diff
changeset
|
8 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:
826
diff
changeset
|
9 option) any later version. |
428 | 10 |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 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:
826
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
428 | 18 |
19 /* Synched up with: Not in FSF. */ | |
20 | |
440 | 21 #ifndef INCLUDED_glyphs_msw_h_ |
22 #define INCLUDED_glyphs_msw_h_ | |
428 | 23 |
24 #ifdef HAVE_MS_WINDOWS | |
25 | |
771 | 26 #include "syswindows.h" |
428 | 27 #include "glyphs.h" |
28 | |
29 /**************************************************************************** | |
30 * Image-Instance Object * | |
31 ****************************************************************************/ | |
32 | |
33 struct mswindows_image_instance_data | |
34 { | |
771 | 35 HBITMAP *bitmaps; |
428 | 36 HICON icon; |
442 | 37 int real_width, real_height; |
428 | 38 }; |
39 | |
40 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ | |
41 ((struct mswindows_image_instance_data *) (i)->data) | |
42 | |
43 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ | |
44 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0]) | |
45 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ | |
46 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) | |
47 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ | |
48 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) | |
49 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | |
771 | 50 (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ |
428 | 51 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ |
52 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) | |
442 | 53 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ |
54 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) | |
55 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ | |
56 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) | |
428 | 57 |
58 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ | |
59 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) | |
771 | 60 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \ |
61 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice)) | |
428 | 62 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ |
63 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) | |
64 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | |
65 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) | |
66 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ | |
67 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) | |
68 | |
826 | 69 int mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii, |
70 struct frame *f, | |
71 int newx, int newy); | |
72 HBITMAP mswindows_create_resized_bitmap (Lisp_Image_Instance *ii, | |
73 struct frame *f, | |
74 int newx, int newy); | |
75 HBITMAP mswindows_create_resized_mask (Lisp_Image_Instance *ii, | |
76 struct frame *f, | |
77 int newx, int newy); | |
78 void mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image, | |
79 int cursor); | |
428 | 80 |
81 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ | |
82 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
83 | |
84 #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ | |
85 WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i)) | |
86 | |
87 struct mswindows_subwindow_data | |
88 { | |
89 HWND clip_window; | |
90 }; | |
91 | |
92 #define MSWINDOWS_SUBWINDOW_DATA(i) \ | |
442 | 93 ((struct mswindows_subwindow_data *) (i)->data) |
428 | 94 #define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ |
95 (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window) | |
96 | |
442 | 97 #define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \ |
98 MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i)) | |
428 | 99 #define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ |
100 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
101 | |
442 | 102 #define DOMAIN_MSWINDOWS_HANDLE(domain) \ |
103 ((IMAGE_INSTANCEP (domain) && \ | |
104 XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \ | |
105 XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \ | |
106 FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain))) | |
107 | |
428 | 108 #endif /* HAVE_MS_WINDOWS */ |
440 | 109 |
110 #endif /* INCLUDED_glyphs_msw_h_ */ |