comparison src/console-msw-impl.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 141c2920ea48
children d1247f3cc363
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
79 * Devices 79 * Devices
80 */ 80 */
81 81
82 struct mswindows_device 82 struct mswindows_device
83 { 83 {
84 #ifdef NEW_GC
85 struct lrecord_header header;
86 #endif /* NEW_GC */
84 Lisp_Object fontlist; /* List of (STRING . FIXED-P), device fonts */ 87 Lisp_Object fontlist; /* List of (STRING . FIXED-P), device fonts */
85 HDC hcdc; /* Compatible DC */ 88 HDC hcdc; /* Compatible DC */
86 DWORD update_tick; /* Used when device is modified through 89 DWORD update_tick; /* Used when device is modified through
87 Windows messages, see WM_DISPLAYCHANGE 90 Windows messages, see WM_DISPLAYCHANGE
88 in event-msw.c */ 91 in event-msw.c */
89 }; 92 };
90 93
94 #ifdef NEW_GC
95 typedef struct mswindows_device Lisp_Mswindows_Device;
96
97 DECLARE_LISP_OBJECT (mswindows_device, Lisp_Mswindows_Device);
98
99 #define XMSWINDOWS_DEVICE(x) \
100 XRECORD (x, mswindows_device, Lisp_Mswindows_Device)
101 #define wrap_mswindows_device(p) wrap_record (p, mswindows_device)
102 #define MSWINDOWS_DEVICE_P(x) RECORDP (x, mswindows_device)
103 #endif /* NEW_GC */
104
91 #define DEVICE_MSWINDOWS_DATA(d) DEVICE_TYPE_DATA (d, mswindows) 105 #define DEVICE_MSWINDOWS_DATA(d) DEVICE_TYPE_DATA (d, mswindows)
92 #define DEVICE_MSWINDOWS_FONTLIST(d) (DEVICE_MSWINDOWS_DATA (d)->fontlist) 106 #define DEVICE_MSWINDOWS_FONTLIST(d) (DEVICE_MSWINDOWS_DATA (d)->fontlist)
93 #define DEVICE_MSWINDOWS_HCDC(d) (DEVICE_MSWINDOWS_DATA (d)->hcdc) 107 #define DEVICE_MSWINDOWS_HCDC(d) (DEVICE_MSWINDOWS_DATA (d)->hcdc)
94 #define DEVICE_MSWINDOWS_UPDATE_TICK(d) (DEVICE_MSWINDOWS_DATA (d)->update_tick) 108 #define DEVICE_MSWINDOWS_UPDATE_TICK(d) (DEVICE_MSWINDOWS_DATA (d)->update_tick)
95 109
96 struct msprinter_device 110 struct msprinter_device
97 { 111 {
112 #ifdef NEW_GC
113 struct lrecord_header header;
114 #endif /* NEW_GC */
98 HDC hdc, hcdc; /* Printer and the comp. DCs */ 115 HDC hdc, hcdc; /* Printer and the comp. DCs */
99 HANDLE hprinter; 116 HANDLE hprinter;
100 Lisp_Object name; 117 Lisp_Object name;
101 Lisp_Object devmode; 118 Lisp_Object devmode;
102 Lisp_Object fontlist; 119 Lisp_Object fontlist;
103 }; 120 };
121
122 #ifdef NEW_GC
123 typedef struct msprinter_device Lisp_Msprinter_Device;
124
125 DECLARE_LISP_OBJECT (msprinter_device, Lisp_Msprinter_Device);
126
127 #define XMSPRINTER_DEVICE(x) \
128 XRECORD (x, msprinter_device, Lisp_Msprinter_Device)
129 #define wrap_msprinter_device(p) wrap_record (p, msprinter_device)
130 #define MSPRINTER_DEVICE_P(x) RECORDP (x, msprinter_device)
131 #endif /* NEW_GC */
104 132
105 #define DEVICE_MSPRINTER_DATA(d) DEVICE_TYPE_DATA (d, msprinter) 133 #define DEVICE_MSPRINTER_DATA(d) DEVICE_TYPE_DATA (d, msprinter)
106 #define DEVICE_MSPRINTER_HDC(d) (DEVICE_MSPRINTER_DATA (d)->hdc) 134 #define DEVICE_MSPRINTER_HDC(d) (DEVICE_MSPRINTER_DATA (d)->hdc)
107 #define DEVICE_MSPRINTER_HCDC(d) (DEVICE_MSPRINTER_DATA (d)->hcdc) 135 #define DEVICE_MSPRINTER_HCDC(d) (DEVICE_MSPRINTER_DATA (d)->hcdc)
108 #define DEVICE_MSPRINTER_HPRINTER(d) (DEVICE_MSPRINTER_DATA (d)->hprinter) 136 #define DEVICE_MSPRINTER_HPRINTER(d) (DEVICE_MSPRINTER_DATA (d)->hprinter)
137 * Frames 165 * Frames
138 */ 166 */
139 167
140 struct mswindows_frame 168 struct mswindows_frame
141 { 169 {
170 #ifdef NEW_GC
171 struct lrecord_header header;
172 #endif /* NEW_GC */
173
142 /* win32 window handle */ 174 /* win32 window handle */
143 HWND hwnd; 175 HWND hwnd;
144 176
145 /* DC for this win32 window */ 177 /* DC for this win32 window */
146 HDC hdc; 178 HDC hdc;
196 228
197 /* Geometry, in characters, as specified by proplist during frame 229 /* Geometry, in characters, as specified by proplist during frame
198 creation. Members are set to -1 for unspecified */ 230 creation. Members are set to -1 for unspecified */
199 XEMACS_RECT_WH *target_rect; 231 XEMACS_RECT_WH *target_rect;
200 }; 232 };
233
234 #ifdef NEW_GC
235 typedef struct mswindows_frame Lisp_Mswindows_Frame;
236
237 DECLARE_LISP_OBJECT (mswindows_frame, Lisp_Mswindows_Frame);
238
239 #define XMSWINDOWS_FRAME(x) \
240 XRECORD (x, mswindows_frame, Lisp_Mswindows_Frame)
241 #define wrap_mswindows_frame(p) wrap_record (p, mswindows_frame)
242 #define MSWINDOWS_FRAME_P(x) RECORDP (x, mswindows_frame)
243 #endif /* NEW_GC */
201 244
202 #define FRAME_MSWINDOWS_DATA(f) FRAME_TYPE_DATA (f, mswindows) 245 #define FRAME_MSWINDOWS_DATA(f) FRAME_TYPE_DATA (f, mswindows)
203 246
204 #define FRAME_MSWINDOWS_HANDLE(f) (FRAME_MSWINDOWS_DATA (f)->hwnd) 247 #define FRAME_MSWINDOWS_HANDLE(f) (FRAME_MSWINDOWS_DATA (f)->hwnd)
205 #define FRAME_MSWINDOWS_DC(f) (FRAME_MSWINDOWS_DATA (f)->hdc) 248 #define FRAME_MSWINDOWS_DC(f) (FRAME_MSWINDOWS_DATA (f)->hdc)