mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-24 05:47:36 +00:00
2d764c783d
* xfaces.c (XColor) [!HAVE_X_WINDOWS]: Provide a typedef for non-X frames. (Vface_tty_color_alist): Remove. (tty_defined_color): New function. (defined_color): Rewrite to support any type of frame. (tty_color_name): New function. (face_color_supported_p, Fface_color_gray_p, Fface_color_supported_p): Support non-X frames. (load_color): Enclose the color name in quotes, in the log messages. Remove DOS-specific version of load_color. (realize_tty_face): Take the supported colors from tty-color-alist. Support translation of X colors to the closest tty color, for both MSDOS and tty frames. [MSDOS]: Don't invert face colors if they were taken from the frame colors. (Fface_register_tty_color, Fface_clear_tty_colors): Remove. * frame.h (struct x_output) [!MSDOS, !WINDOWSNT, !HAVE_X_WINDOWS]: Define a mostly empty surrogate. (tty_display): Declare. * frame.c (make_terminal_frame) [!macintosh]: Don't use tty_display. (Fframe_parameters): Don't invert colors of non-FRAME_WINDOW_P frames when the frame's param_alist includes 'reverse. (tty_display): Define. (make_terminal_frame) [!MSDOS]: Assign &tty_display to the output_data.x member. (Fframe_parameters): Return foreground and background color names on tty frames as well, in addition to MSDOS frames. * msdos.h (DisplayWidth, DisplayHeight): Changes for Lisp_Object selected_frame. (struct x_output): Remove unused members; document who uses each member. (FRAME_PARAM_FACES, FRAME_N_PARAM_FACES, FRAME_DEFAULT_PARAM_FACE, FRAME_MODE_LINE_PARAM_FACE, FRAME_COMPUTED_FACES, FRAME_N_COMPUTED_FACES, FRAME_SIZE_COMPUTED_FACES, FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): Remove unused macro definintions. * msdos.c (IT_set_frame_parameters): Don't call recompute_basic_faces, the next redisplay will, anyway. (x_current_display): Remove unused variable. Many functions: changes for Lisp_object selected_frame. (IT_set_face): If the tty_reverse_p flag is set for the face, reverse the foreground and background colors. (Fmsdos_remember_default_colors): New function. (syms_of_msdos): Defsubr it. (IT_set_frame_parameters): Use initial_screen_colors[] when creating a new frame. If the frame parameters include 'reverse, swap the foreground and background colors. (internal_terminal_init): Initialize initial_screen_colors to -1. (syms_of_msdos): Add DEFVAR_BOOL for x-stretch-cursor, to shut up cus-start.el. * Makefile.in (lisp, shortlisp): Add lisp/term/tty-colors.elc. * xfns.c (x_defined_color): Rename from defined_color. All callers changed. (Fxw_color_defined_p): Renamed from Fx_color_defined_p; all callers changed. (Fxw_color_values): Renamed from Fx_color_values; all callers changed. (Fxw_display_color_p): Renamed from Fx_display_color_p; all callers changed. (x_window_to_frame, x_any_window_to_frame, x_non_menubar_window_to_frame, x_menubar_window_to_frame, x_top_window_to_frame): Use !FRAME_X_P instead of f->output_data.nothing. * xterm.h (x_defined_color): Rename from defined_color. * w32fns.c (x_window_to_frame): Use FRAME_W32_P instead of f->output_data.nothing. (Fxw_color_defined_p): Renamed from Fx_color_defined_p; all callers changed. (Fxw_color_values): Renamed from Fx_color_values; all callers changed. (Fxw_display_color_p): Renamed from Fx_display_color_p; all callers changed. * dispextern.h (tty_color_name): Add prototype. * xmenu.c (menubar_id_to_frame): Use FRAME_WINDOW_P instead of f->output_data.nothing. * w32menu.c (menubar_id_to_frame): Likewise. * w32term.h (w32_output): Declare. * dosfns.c (Qmsdos_color_translate): Remove. (msdos_stdcolor_name): Now returns a Lisp_Object. * dosfns.h (Qmsdos_color_translate): Remove. * s/msdos.h (INTERNAL_TERMINAL): Add entries for color support.
136 lines
4.1 KiB
C
136 lines
4.1 KiB
C
/* MS-DOS specific C utilities, interface.
|
||
Copyright (C) 1993 Free Software Foundation, Inc.
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 2, or (at your option)
|
||
any later version.
|
||
|
||
GNU Emacs is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GNU Emacs; see the file COPYING. If not, write to
|
||
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
#ifndef _MSDOS_H_
|
||
#define _MSDOS_H_
|
||
|
||
#include <dpmi.h>
|
||
|
||
int dos_ttraw ();
|
||
int dos_ttcooked ();
|
||
int dos_get_saved_screen (char **, int *, int *);
|
||
int dos_set_keyboard (int, int);
|
||
void dos_set_window_size (int *, int *);
|
||
|
||
int getdefdir (int, char*);
|
||
void unixtodos_filename (char *);
|
||
void dostounix_filename (char *);
|
||
char *rootrelativepath (char *);
|
||
void init_environment ();
|
||
void internal_terminal_init ();
|
||
void ctrl_break_func (_go32_dpmi_registers *);
|
||
void install_ctrl_break_check ();
|
||
|
||
extern int have_mouse;
|
||
void mouse_init ();
|
||
void mouse_on ();
|
||
void mouse_off ();
|
||
void mouse_moveto (int, int);
|
||
|
||
#ifndef HAVE_X_WINDOWS
|
||
/* Dummy types. */
|
||
typedef int XFontStruct;
|
||
typedef int GC;
|
||
typedef int Pixmap;
|
||
typedef int Display;
|
||
typedef int Window;
|
||
typedef int XRectangle;
|
||
#define PIX_TYPE int
|
||
#define XDISPLAY
|
||
|
||
/* This is a cut-down version of the one in xterm.h, which see. */
|
||
struct x_output
|
||
{
|
||
int left_pos; /* used in xmenu_show (xmenu.c) */
|
||
int top_pos; /* ditto */
|
||
int line_height; /* used in x-popup-menu (xmenu.c) */
|
||
PIX_TYPE background_pixel; /* used in xfaces.c and lots of other places */
|
||
PIX_TYPE foreground_pixel; /* ditto */
|
||
XFontStruct *font; /* used in x-popup-menu (xmenu.c) */
|
||
Window busy_window; /* currently unused (but maybe some day) */
|
||
unsigned busy_p : 1; /* ditto */
|
||
};
|
||
|
||
extern struct x_output the_only_x_display;
|
||
|
||
#define FRAME_X_DISPLAY(f) ((Display *) 0)
|
||
#define FRAME_FOREGROUND_PIXEL(f) (the_only_x_display.foreground_pixel)
|
||
#define FRAME_BACKGROUND_PIXEL(f) (the_only_x_display.background_pixel)
|
||
#define FRAME_FONT(f) (the_only_x_display.font)
|
||
|
||
/* Prototypes. */
|
||
|
||
/* Forward declarations for prototypes. */
|
||
struct frame;
|
||
struct window;
|
||
|
||
/* From xterm.c; emulated on msdos.c */
|
||
|
||
extern void pixel_to_glyph_coords P_ ((struct frame *f, int pix_x, int pix_y,
|
||
int *x, int *y, XRectangle *bounds,
|
||
int noclip));
|
||
extern void glyph_to_pixel_coords P_ ((struct frame *f, int x, int y,
|
||
int *pix_x, int *pix_y));
|
||
|
||
/* Defined in xfns.c; emulated on msdos.c */
|
||
|
||
extern int have_menus_p P_ ((void));
|
||
extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
|
||
extern int x_pixel_width P_ ((struct frame *));
|
||
extern int x_pixel_height P_ ((struct frame *));
|
||
|
||
#define XFreeGC (void)
|
||
#define x_destroy_bitmap(p1,p2)
|
||
#define load_pixmap(p1,p2,p3,p4) (0)
|
||
#define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9)
|
||
#define DisplayWidth(p1,p2) (SELECTED_FRAME()->width)
|
||
#define DisplayHeight(p1,p2) (SELECTED_FRAME()->height)
|
||
#define XMenuSetAEQ (void)
|
||
#define XMenuSetFreeze (void)
|
||
#define XMenuRecompute (void)
|
||
#define FONT_WIDTH(foo) 1
|
||
#define XM_FAILURE -1
|
||
#define XM_SUCCESS 1
|
||
#define XM_NO_SELECT 2
|
||
#define XM_IA_SELECT 3
|
||
#define ButtonReleaseMask 0
|
||
|
||
typedef struct x_menu_struct
|
||
{
|
||
int count;
|
||
char **text;
|
||
struct x_menu_struct **submenu;
|
||
int *panenumber; /* Also used as enable. */
|
||
int allocated;
|
||
int panecount;
|
||
int width;
|
||
} XMenu;
|
||
|
||
XMenu *XMenuCreate (Display *, Window, char *);
|
||
int XMenuAddPane (Display *, XMenu *, char *, int);
|
||
int XMenuAddSelection (Display *, XMenu *, int, int, char *, int);
|
||
void XMenuLocate (Display *, XMenu *, int, int, int, int,
|
||
int *, int *, int *, int *);
|
||
int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned, char **);
|
||
void XMenuDestroy (Display *, XMenu *);
|
||
|
||
#endif /* not HAVE_X_WINDOWS */
|
||
|
||
#endif /* not _MSDOS_H_ */
|