Mercurial > hg > xemacs-beta
diff src/device-impl.h @ 5920:0f2338afbabf cygwin
Minimum necessary to get started:
sufficient to compile OK, run -nw, but not with window
| author | Henry Thompson <ht@markup.co.uk> |
|---|---|
| date | Mon, 21 Apr 2014 11:42:50 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line diff
--- a/src/device-impl.h Thu Dec 16 11:20:17 2021 +0000 +++ b/src/device-impl.h Mon Apr 21 11:42:50 2014 +0100 @@ -52,8 +52,8 @@ ((d)->devmeths->device_specific_frame_props) /* More public: */ -#define DEVICE_TYPE(d) ((d)->devmeths->symbol) -#define XDEVICE_TYPE(d) DEVICE_TYPE (XDEVICE (d)) +#define DEVICE_TYPE_X(d) ((d)->devmeths->symbol) +#define XDEVICE_TYPE(d) DEVICE_TYPE_X (XDEVICE (d)) /******** Accessing / calling a device method *********/ @@ -147,13 +147,13 @@ /* Redefine basic properties more efficiently */ #undef DEVICE_LIVE_P -#define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE (d), Qdead)) +#define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE_X (d), Qdead)) #undef DEVICE_CONSOLE #define DEVICE_CONSOLE(d) ((d)->console) #undef DEVICE_FRAME_LIST #define DEVICE_FRAME_LIST(d) ((d)->frame_list) -#define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) +#define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE_X (d), Q##type) #ifdef ERROR_CHECK_TYPES DECLARE_INLINE_HEADER ( @@ -161,7 +161,7 @@ error_check_device_type (struct device *d, Lisp_Object sym) ) { - assert (EQ (DEVICE_TYPE (d), sym)); + assert (EQ (DEVICE_TYPE_X (d), sym)); return d; } # define DEVICE_TYPE_DATA(d, type) \ @@ -231,27 +231,27 @@ too many places where the abstraction is broken. Need to fix. */ -#define DEVICE_X_P(dev) CONSOLE_TYPESYM_X_P (DEVICE_TYPE (dev)) +#define DEVICE_X_P(dev) CONSOLE_TYPESYM_X_P (DEVICE_TYPE_X (dev)) #define CHECK_X_DEVICE(z) CHECK_DEVICE_TYPE (z, x) #define CONCHECK_X_DEVICE(z) CONCHECK_DEVICE_TYPE (z, x) -#define DEVICE_GTK_P(dev) CONSOLE_TYPESYM_GTK_P (DEVICE_TYPE (dev)) +#define DEVICE_GTK_P(dev) CONSOLE_TYPESYM_GTK_P (DEVICE_TYPE_X (dev)) #define CHECK_GTK_DEVICE(z) CHECK_DEVICE_TYPE (z, gtk) #define CONCHECK_GTK_DEVICE(z) CONCHECK_DEVICE_TYPE (z, gtk) -#define DEVICE_MSWINDOWS_P(dev) CONSOLE_TYPESYM_MSWINDOWS_P (DEVICE_TYPE (dev)) +#define DEVICE_MSWINDOWS_P(dev) CONSOLE_TYPESYM_MSWINDOWS_P (DEVICE_TYPE_X (dev)) #define CHECK_MSWINDOWS_DEVICE(z) CHECK_DEVICE_TYPE (z, mswindows) #define CONCHECK_MSWINDOWS_DEVICE(z) CONCHECK_DEVICE_TYPE (z, mswindows) -#define DEVICE_TTY_P(dev) CONSOLE_TYPESYM_TTY_P (DEVICE_TYPE (dev)) +#define DEVICE_TTY_P(dev) CONSOLE_TYPESYM_TTY_P (DEVICE_TYPE_X (dev)) #define CHECK_TTY_DEVICE(z) CHECK_DEVICE_TYPE (z, tty) #define CONCHECK_TTY_DEVICE(z) CONCHECK_DEVICE_TYPE (z, tty) -#define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE (dev)) +#define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE_X (dev)) #define CHECK_STREAM_DEVICE(z) CHECK_DEVICE_TYPE (z, stream) #define CONCHECK_STREAM_DEVICE(z) CONCHECK_DEVICE_TYPE (z, stream) -#define DEVICE_WIN_P(dev) CONSOLE_TYPESYM_WIN_P (DEVICE_TYPE (dev)) +#define DEVICE_WIN_P(dev) CONSOLE_TYPESYM_WIN_P (DEVICE_TYPE_X (dev)) #define DEVICE_REDISPLAY_INFO(d) ((d)->redisplay_info)