comparison src/console.h @ 213:78f53ef88e17 r20-4b5

Import from CVS: tag r20-4b5
author cvs
date Mon, 13 Aug 2007 10:06:47 +0200
parents 41ff10fd062f
children 1f0dabaa0855
comparison
equal deleted inserted replaced
212:d8688acf4c5b 213:78f53ef88e17
437 #ifdef HAVE_TTY 437 #ifdef HAVE_TTY
438 #define CONSOLE_TYPESYM_TTY_P(typesym) EQ (typesym, Qtty) 438 #define CONSOLE_TYPESYM_TTY_P(typesym) EQ (typesym, Qtty)
439 #else 439 #else
440 #define CONSOLE_TYPESYM_TTY_P(typesym) 0 440 #define CONSOLE_TYPESYM_TTY_P(typesym) 0
441 #endif 441 #endif
442 #ifdef HAVE_W32GUI 442 #ifdef HAVE_MS_WINDOWS
443 #define CONSOLE_TYPESYM_W32_P(typesym) EQ (typesym, Qw32) 443 #define CONSOLE_TYPESYM_MSWINDOWS_P(typesym) EQ (typesym, Qmswindows)
444 #else 444 #else
445 #define CONSOLE_TYPESYM_W32_P(typesym) 0 445 #define CONSOLE_TYPESYM_MSWINDOWS_P(typesym) 0
446 #endif 446 #endif
447 #define CONSOLE_TYPESYM_STREAM_P(typesym) EQ (typesym, Qstream) 447 #define CONSOLE_TYPESYM_STREAM_P(typesym) EQ (typesym, Qstream)
448 448
449 #define CONSOLE_TYPESYM_WIN_P(typesym) \ 449 #define CONSOLE_TYPESYM_WIN_P(typesym) \
450 (CONSOLE_TYPESYM_X_P (typesym)) 450 (CONSOLE_TYPESYM_X_P (typesym) || CONSOLE_TYPESYM_MSWINDOWS_P (typesym))
451 451
452 #define CONSOLE_X_P(con) CONSOLE_TYPESYM_X_P (CONSOLE_TYPE (con)) 452 #define CONSOLE_X_P(con) CONSOLE_TYPESYM_X_P (CONSOLE_TYPE (con))
453 #define CHECK_X_CONSOLE(z) CHECK_CONSOLE_TYPE (z, x) 453 #define CHECK_X_CONSOLE(z) CHECK_CONSOLE_TYPE (z, x)
454 #define CONCHECK_X_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, x) 454 #define CONCHECK_X_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, x)
455 455
456 #define CONSOLE_TTY_P(con) CONSOLE_TYPESYM_TTY_P (CONSOLE_TYPE (con)) 456 #define CONSOLE_TTY_P(con) CONSOLE_TYPESYM_TTY_P (CONSOLE_TYPE (con))
457 #define CHECK_TTY_CONSOLE(z) CHECK_CONSOLE_TYPE (z, tty) 457 #define CHECK_TTY_CONSOLE(z) CHECK_CONSOLE_TYPE (z, tty)
458 #define CONCHECK_TTY_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, tty) 458 #define CONCHECK_TTY_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, tty)
459 459
460 #define CONSOLE_W32_P(con) CONSOLE_TYPESYM_W32_P (CONSOLE_TYPE (con)) 460 #define CONSOLE_MSWINDOWS_P(con) CONSOLE_TYPESYM_MSWINDOWS_P (CONSOLE_TYPE (con))
461 #define CHECK_W32_CONSOLE(z) CHECK_CONSOLE_TYPE (z, w32) 461 #define CHECK_MSWINDOWS_CONSOLE(z) CHECK_CONSOLE_TYPE (z, mswindows)
462 #define CONCHECK_W32_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, w32) 462 #define CONCHECK_MSWINDOWS_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, mswindows)
463 463
464 #define CONSOLE_STREAM_P(con) CONSOLE_TYPESYM_STREAM_P (CONSOLE_TYPE (con)) 464 #define CONSOLE_STREAM_P(con) CONSOLE_TYPESYM_STREAM_P (CONSOLE_TYPE (con))
465 #define CHECK_STREAM_CONSOLE(z) CHECK_CONSOLE_TYPE (z, stream) 465 #define CHECK_STREAM_CONSOLE(z) CHECK_CONSOLE_TYPE (z, stream)
466 #define CONCHECK_STREAM_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, stream) 466 #define CONCHECK_STREAM_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, stream)
467 467
499 499
500 extern Lisp_Object Qtty, Qstream, Qdead; 500 extern Lisp_Object Qtty, Qstream, Qdead;
501 #ifdef HAVE_X_WINDOWS 501 #ifdef HAVE_X_WINDOWS
502 extern Lisp_Object Qx; 502 extern Lisp_Object Qx;
503 #endif /* HAVE_X_WINDOWS */ 503 #endif /* HAVE_X_WINDOWS */
504 #ifdef HAVE_W32GUI 504 #ifdef HAVE_MS_WINDOWS
505 extern Lisp_Object Qw32; 505 extern Lisp_Object Qmswindows;
506 #endif /* HAVE_W32GUI */ 506 #endif /* HAVE_MS_WINDOWS */
507 507
508 int valid_console_type_p (Lisp_Object type); 508 int valid_console_type_p (Lisp_Object type);
509 509
510 #define CONSOLE_LIVE_P(con) (!EQ (CONSOLE_TYPE (con), Qdead)) 510 #define CONSOLE_LIVE_P(con) (!EQ (CONSOLE_TYPE (con), Qdead))
511 511