Mercurial > hg > xemacs-beta
annotate src/glyphs-x.h @ 5887:6eca500211f4
Prototype for X509_check_host() has changed, detect this in configure.ac
ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* configure.ac:
If X509_check_host() is available, check the number of arguments
it takes. Don't use it if it takes any number of arguments other
than five. Also don't use it if <openssl/x509v3.h> does not
declare it, since if that is so there is no portable way to tell
how many arguments it should take, and so we would end up smashing
the stack.
* configure: Regenerate.
src/ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* tls.c:
#include <openssl/x509v3.h> for its prototype for
X509_check_host().
* tls.c (tls_open):
Pass the new fifth argument to X509_check_host().
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 09 Apr 2015 14:27:02 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* X-specific glyphs and related. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996 Ben Wing | |
| 5 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
442
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 10 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:
442
diff
changeset
|
11 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:
442
diff
changeset
|
12 option) any later version. |
| 428 | 13 |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 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:
442
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 21 |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_glyphs_x_h_ |
| 25 #define INCLUDED_glyphs_x_h_ | |
| 428 | 26 |
| 27 #include "glyphs.h" | |
| 28 | |
| 29 #ifdef HAVE_X_WINDOWS | |
| 30 | |
| 31 #include "xintrinsic.h" | |
| 32 #include "../lwlib/lwlib.h" | |
| 442 | 33 #include "../lwlib/lwlib-utils.h" |
| 428 | 34 |
| 35 /**************************************************************************** | |
| 36 * Image-Instance Object * | |
| 37 ****************************************************************************/ | |
| 38 | |
| 39 struct x_image_instance_data | |
| 40 { | |
| 41 Pixmap* pixmaps; | |
| 42 Cursor cursor; | |
| 43 | |
| 44 /* If depth>0, then that means that other colors were allocated when | |
| 45 this pixmap was loaded. These are they; we need to free them when | |
| 46 finalizing the image instance. */ | |
| 47 Colormap colormap; | |
| 48 unsigned long *pixels; | |
| 49 int npixels; | |
| 50 | |
| 51 /* Should we hang on to the extra info from the XpmAttributes, like | |
| 52 the textual color table and the comments? Is that useful? */ | |
| 53 }; | |
| 54 | |
| 55 #define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data) | |
| 56 | |
| 57 #define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
| 58 #define IMAGE_INSTANCE_X_PIXMAP_SLICE(i,slice) \ | |
| 59 (X_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
| 60 #define IMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
| 61 (X_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
| 62 #define IMAGE_INSTANCE_X_MASK(i) \ | |
| 63 (Pixmap)(IMAGE_INSTANCE_PIXMAP_MASK (i)) | |
| 64 #define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor) | |
| 65 #define IMAGE_INSTANCE_X_COLORMAP(i) (X_IMAGE_INSTANCE_DATA (i)->colormap) | |
| 66 #define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels) | |
| 67 #define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels) | |
| 68 | |
| 69 #define XIMAGE_INSTANCE_X_PIXMAP(i) \ | |
| 70 IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i)) | |
| 71 #define XIMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
| 72 IMAGE_INSTANCE_X_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
| 73 #define XIMAGE_INSTANCE_X_PIXMAP_SLICE(i) \ | |
| 74 IMAGE_INSTANCE_X_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
| 75 #define XIMAGE_INSTANCE_X_MASK(i) \ | |
| 76 IMAGE_INSTANCE_X_MASK (XIMAGE_INSTANCE (i)) | |
| 77 #define XIMAGE_INSTANCE_X_CURSOR(i) \ | |
| 78 IMAGE_INSTANCE_X_CURSOR (XIMAGE_INSTANCE (i)) | |
| 79 #define XIMAGE_INSTANCE_X_PIXELS(i) \ | |
| 80 IMAGE_INSTANCE_X_PIXELS (XIMAGE_INSTANCE (i)) | |
| 81 #define XIMAGE_INSTANCE_X_NPIXELS(i) \ | |
| 82 IMAGE_INSTANCE_X_NPIXELS (XIMAGE_INSTANCE (i)) | |
| 83 | |
| 84 /**************************************************************************** | |
| 85 * Subwindow Object * | |
| 86 ****************************************************************************/ | |
| 87 | |
| 88 struct x_subwindow_data | |
| 89 { | |
| 90 union | |
| 91 { | |
| 92 struct | |
| 93 { | |
| 94 Display *display; | |
| 95 Window parent_window; | |
| 96 Window clip_window; | |
| 97 } sub; | |
| 442 | 98 struct |
| 428 | 99 { |
| 100 Widget clip_window; | |
| 101 Position x_offset; | |
| 102 Position y_offset; | |
| 103 LWLIB_ID id; | |
| 104 } wid; | |
| 105 } data; | |
| 106 }; | |
| 107 | |
| 108 #define X_SUBWINDOW_INSTANCE_DATA(i) ((struct x_subwindow_data *) (i)->data) | |
| 109 | |
| 110 #define IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
| 111 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.display) | |
| 112 #define IMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ | |
| 113 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
| 114 #define IMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
| 115 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
| 116 #define IMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
| 117 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
| 118 #define IMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
| 119 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
| 120 #define IMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
| 121 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
| 122 #define IMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
| 123 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
| 442 | 124 #define IMAGE_INSTANCE_X_SUBWINDOW_ID(i) \ |
| 125 (* (Window *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 126 #define IMAGE_INSTANCE_X_WIDGET_ID(i) \ | |
| 127 (* (Widget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
| 128 | |
| 428 | 129 #define XIMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ |
| 130 IMAGE_INSTANCE_X_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
| 131 #define XIMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
| 132 IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
| 133 #define XIMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
| 134 IMAGE_INSTANCE_X_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
| 135 #define XIMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
| 136 IMAGE_INSTANCE_X_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
| 137 #define XIMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
| 138 IMAGE_INSTANCE_X_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
| 139 #define XIMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
| 140 IMAGE_INSTANCE_X_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
| 141 #define XIMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
| 142 IMAGE_INSTANCE_X_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
| 442 | 143 #define XIMAGE_INSTANCE_X_WIDGET_ID(i) \ |
| 144 IMAGE_INSTANCE_X_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
| 145 | |
| 146 #define DOMAIN_X_WIDGET(domain) \ | |
| 147 ((IMAGE_INSTANCEP (domain) && \ | |
| 148 X_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
| 149 XIMAGE_INSTANCE_X_WIDGET_ID (domain) : \ | |
| 150 FRAME_X_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
| 428 | 151 |
| 152 #endif /* HAVE_X_WINDOWS */ | |
| 440 | 153 #endif /* INCLUDED_glyphs_x_h_ */ |