diff options
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 430 |
1 files changed, 204 insertions, 226 deletions
diff --git a/src/xfns.c b/src/xfns.c index f576b7f6a3c..0bce9eb68c3 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -48,6 +48,7 @@ Boston, MA 02110-1301, USA. */ #include "systime.h" #include "termhooks.h" #include "atimer.h" +#include "termchar.h" #ifdef HAVE_X_WINDOWS @@ -73,8 +74,13 @@ Boston, MA 02110-1301, USA. */ #include <X11/Shell.h> #ifndef USE_MOTIF +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#include <X11/Xaw3d/Label.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> #include <X11/Xaw/Label.h> +#endif /* HAVE_XAW3D */ #endif /* USE_MOTIF */ #ifdef USG @@ -133,11 +139,7 @@ static Lisp_Object Vgtk_version_string; #endif /* USE_GTK */ -#ifdef HAVE_X11R4 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) -#else -#define MAXREQUEST(dpy) ((dpy)->max_request_size) -#endif /* The gray bitmap `bitmaps/gray'. This is done because xterm.c uses it, and including `bitmaps/gray' more than once is a problem when @@ -251,17 +253,18 @@ check_x_frame (frame) return f; } -/* Let the user specify an X display with a frame. +/* Let the user specify an X display with a Lisp object. + OBJECT may be nil, a frame or a terminal id. nil stands for the selected frame--or, if that is not an X frame, the first X display on the list. */ struct x_display_info * -check_x_display_info (frame) - Lisp_Object frame; +check_x_display_info (object) + Lisp_Object object; { struct x_display_info *dpyinfo = NULL; - if (NILP (frame)) + if (NILP (object)) { struct frame *sf = XFRAME (selected_frame); @@ -272,11 +275,20 @@ check_x_display_info (frame) else error ("X windows are not in use or not initialized"); } - else if (STRINGP (frame)) - dpyinfo = x_display_info_for_name (frame); + else if (INTEGERP (object)) + { + struct terminal *t = get_terminal (object, 1); + + if (t->type != output_x_window) + error ("Terminal %d is not an X display", XINT (object)); + + dpyinfo = t->display_info.x; + } + else if (STRINGP (object)) + dpyinfo = x_display_info_for_name (object); else { - FRAME_PTR f = check_x_frame (frame); + FRAME_PTR f = check_x_frame (object); dpyinfo = FRAME_X_DISPLAY_INFO (f); } @@ -857,8 +869,8 @@ x_set_foreground_color (f, arg, oldval) unsigned long fg, old_fg; fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); - old_fg = x->foreground_pixel; - x->foreground_pixel = fg; + old_fg = FRAME_FOREGROUND_PIXEL (f); + FRAME_FOREGROUND_PIXEL (f) = fg; if (FRAME_X_WINDOW (f) != 0) { @@ -895,8 +907,8 @@ x_set_background_color (f, arg, oldval) unsigned long bg; bg = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f)); - unload_color (f, x->background_pixel); - x->background_pixel = bg; + unload_color (f, FRAME_BACKGROUND_PIXEL (f)); + FRAME_BACKGROUND_PIXEL (f) = bg; if (FRAME_X_WINDOW (f) != 0) { @@ -920,7 +932,7 @@ x_set_background_color (f, arg, oldval) !NILP (bar); bar = XSCROLL_BAR (bar)->next) { - Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)); + Window window = XSCROLL_BAR (bar)->x_window; XSetWindowBackground (dpy, window, bg); } } @@ -944,13 +956,13 @@ x_set_mouse_color (f, arg, oldval) Cursor cursor, nontext_cursor, mode_cursor, hand_cursor; Cursor hourglass_cursor, horizontal_drag_cursor; unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); - unsigned long mask_color = x->background_pixel; + unsigned long mask_color = FRAME_BACKGROUND_PIXEL (f); /* Don't let pointers be invisible. */ if (mask_color == pixel) { x_free_colors (f, &pixel, 1); - pixel = x_copy_color (f, x->foreground_pixel); + pixel = x_copy_color (f, FRAME_FOREGROUND_PIXEL (f)); } unload_color (f, x->mouse_pixel); @@ -1093,13 +1105,13 @@ x_set_cursor_color (f, arg, oldval) fore_pixel_allocated_p = 1; } else - fore_pixel = x->background_pixel; + fore_pixel = FRAME_BACKGROUND_PIXEL (f); pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); pixel_allocated_p = 1; /* Make sure that the cursor color differs from the background color. */ - if (pixel == x->background_pixel) + if (pixel == FRAME_BACKGROUND_PIXEL (f)) { if (pixel_allocated_p) { @@ -1115,7 +1127,7 @@ x_set_cursor_color (f, arg, oldval) x_free_colors (f, &fore_pixel, 1); fore_pixel_allocated_p = 0; } - fore_pixel = x->background_pixel; + fore_pixel = FRAME_BACKGROUND_PIXEL (f); } } @@ -1400,10 +1412,8 @@ x_set_tool_bar_lines (f, value, oldval) below the menu bar. */ if (FRAME_X_WINDOW (f) && FRAME_TOOL_BAR_LINES (f) == 0) { - updating_frame = f; - clear_frame (); + clear_frame (f); clear_current_matrices (f); - updating_frame = NULL; } /* If the tool bar gets smaller, the internal border below it @@ -1454,10 +1464,10 @@ x_set_scroll_bar_foreground (f, value, oldval) if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (condemn_scroll_bars_hook) - (*condemn_scroll_bars_hook) (f); - if (judge_scroll_bars_hook) - (*judge_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->condemn_scroll_bars_hook) + (*FRAME_TERMINAL (f)->condemn_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->judge_scroll_bars_hook) + (*FRAME_TERMINAL (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_foreground, value); redraw_frame (f); @@ -1503,10 +1513,10 @@ x_set_scroll_bar_background (f, value, oldval) if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) { /* Remove all scroll bars because they have wrong colors. */ - if (condemn_scroll_bars_hook) - (*condemn_scroll_bars_hook) (f); - if (judge_scroll_bars_hook) - (*judge_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->condemn_scroll_bars_hook) + (*FRAME_TERMINAL (f)->condemn_scroll_bars_hook) (f); + if (FRAME_TERMINAL (f)->judge_scroll_bars_hook) + (*FRAME_TERMINAL (f)->judge_scroll_bars_hook) (f); update_face_from_frame_parameter (f, Qscroll_bar_background, value); redraw_frame (f); @@ -1606,7 +1616,6 @@ x_set_name_internal (f, name) if (FRAME_X_WINDOW (f)) { BLOCK_INPUT; -#ifdef HAVE_X11R4 { XTextProperty text, icon; int bytes, stringp; @@ -1674,12 +1683,6 @@ x_set_name_internal (f, name) if (do_free_text_value) xfree (text.value); } -#else /* not HAVE_X11R4 */ - XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - SDATA (name)); - XStoreName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - SDATA (name)); -#endif /* not HAVE_X11R4 */ UNBLOCK_INPUT; } } @@ -1840,9 +1843,9 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass, build_string (foreground_p ? "foreground" : "background"), - empty_string, + empty_unibyte_string, build_string ("verticalScrollBar"), - empty_string); + empty_unibyte_string); if (!STRINGP (tem)) { /* If nothing has been specified, scroll bars will use a @@ -1866,23 +1869,6 @@ x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass, -#if !defined (HAVE_X11R4) && !defined (HAVE_XSETWMPROTOCOLS) - -Status -XSetWMProtocols (dpy, w, protocols, count) - Display *dpy; - Window w; - Atom *protocols; - int count; -{ - Atom prop; - prop = XInternAtom (dpy, "WM_PROTOCOLS", False); - if (prop == None) return False; - XChangeProperty (dpy, w, prop, XA_ATOM, 32, PropModeReplace, - (unsigned char *) protocols, count); - return True; -} -#endif /* not HAVE_X11R4 && not HAVE_XSETWMPROTOCOLS */ #ifdef USE_X_TOOLKIT @@ -2726,7 +2712,7 @@ x_window (f) XSetWindowAttributes attributes; unsigned long attribute_mask; - attributes.background_pixel = f->output_data.x->background_pixel; + attributes.background_pixel = FRAME_BACKGROUND_PIXEL (f); attributes.border_pixel = f->output_data.x->border_pixel; attributes.bit_gravity = StaticGravity; attributes.backing_store = NotUseful; @@ -2853,7 +2839,9 @@ x_icon (f, parms) Lisp_Object parms; { Lisp_Object icon_x, icon_y; +#if 0 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); +#endif /* Set the position of the icon. Note that twm groups all icons in an icon window. */ @@ -2914,8 +2902,8 @@ x_make_gc (f) /* Normal video */ gc_values.font = FRAME_FONT (f)->fid; - gc_values.foreground = f->output_data.x->foreground_pixel; - gc_values.background = f->output_data.x->background_pixel; + gc_values.foreground = FRAME_FOREGROUND_PIXEL (f); + gc_values.background = FRAME_BACKGROUND_PIXEL (f); gc_values.line_width = 0; /* Means 1 using fast algorithm. */ f->output_data.x->normal_gc = XCreateGC (FRAME_X_DISPLAY (f), @@ -2924,8 +2912,8 @@ x_make_gc (f) &gc_values); /* Reverse video style. */ - gc_values.foreground = f->output_data.x->background_pixel; - gc_values.background = f->output_data.x->foreground_pixel; + gc_values.foreground = FRAME_BACKGROUND_PIXEL (f); + gc_values.background = FRAME_FOREGROUND_PIXEL (f); f->output_data.x->reverse_gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), @@ -2933,7 +2921,7 @@ x_make_gc (f) &gc_values); /* Cursor has cursor-color background, background-color foreground. */ - gc_values.foreground = f->output_data.x->background_pixel; + gc_values.foreground = FRAME_BACKGROUND_PIXEL (f); gc_values.background = f->output_data.x->cursor_pixel; gc_values.fill_style = FillOpaqueStippled; gc_values.stipple @@ -2957,8 +2945,8 @@ x_make_gc (f) = (XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window, gray_bits, gray_width, gray_height, - f->output_data.x->foreground_pixel, - f->output_data.x->background_pixel, + FRAME_FOREGROUND_PIXEL (f), + FRAME_BACKGROUND_PIXEL (f), DefaultDepth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)))); UNBLOCK_INPUT; @@ -3013,6 +3001,12 @@ unwind_create_frame (frame) { struct frame *f = XFRAME (frame); + /* If frame is already dead, nothing to do. This can happen if the + display is disconnected after the frame has become official, but + before x_create_frame removes the unwind protect. */ + if (!FRAME_LIVE_P (f)) + return Qnil; + /* If frame is ``official'', nothing to do. */ if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) { @@ -3061,24 +3055,27 @@ This function is an internal primitive--use `make-frame' instead. */) Lisp_Object parent; struct kboard *kb; - check_x (); - parms = Fcopy_alist (parms); /* Use this general default value to start with until we know if this frame has a specified name. */ Vx_resource_name = Vinvocation_name; - display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); + display = x_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_NUMBER); + if (EQ (display, Qunbound)) + display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); if (EQ (display, Qunbound)) display = Qnil; dpyinfo = check_x_display_info (display); #ifdef MULTI_KBOARD - kb = dpyinfo->kboard; + kb = dpyinfo->terminal->kboard; #else kb = &the_only_kboard; #endif + if (!dpyinfo->terminal->name) + error ("Terminal is not live, can't create new frames on it"); + name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); if (!STRINGP (name) && ! EQ (name, Qunbound) @@ -3119,6 +3116,9 @@ This function is an internal primitive--use `make-frame' instead. */) /* Note that X Windows does support scroll bars. */ FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; + f->output_method = output_x_window; f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output)); bzero (f->output_data.x, sizeof (struct x_output)); @@ -3145,9 +3145,6 @@ This function is an internal primitive--use `make-frame' instead. */) image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD - FRAME_KBOARD (f) = kb; -#endif /* These colors will be set anyway later, but it's important to get the color reference counts right, so initialize them! */ @@ -3158,8 +3155,8 @@ This function is an internal primitive--use `make-frame' instead. */) /* Function x_decode_color can signal an error. Make sure to initialize color slots so that we won't try to free colors we haven't allocated. */ - f->output_data.x->foreground_pixel = -1; - f->output_data.x->background_pixel = -1; + FRAME_FOREGROUND_PIXEL (f) = -1; + FRAME_BACKGROUND_PIXEL (f) = -1; f->output_data.x->cursor_pixel = -1; f->output_data.x->cursor_foreground_pixel = -1; f->output_data.x->border_pixel = -1; @@ -3167,9 +3164,9 @@ This function is an internal primitive--use `make-frame' instead. */) black = build_string ("black"); GCPRO1 (black); - f->output_data.x->foreground_pixel + FRAME_FOREGROUND_PIXEL (f) = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); - f->output_data.x->background_pixel + FRAME_BACKGROUND_PIXEL (f) = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); f->output_data.x->cursor_pixel = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); @@ -3436,7 +3433,7 @@ This function is an internal primitive--use `make-frame' instead. */) } /* Initialize `default-minibuffer-frame' in case this is the first - frame on this display device. */ + frame on this terminal. */ if (FRAME_HAS_MINIBUF_P (f) && (!FRAMEP (kb->Vdefault_minibuffer_frame) || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) @@ -3444,7 +3441,7 @@ This function is an internal primitive--use `make-frame' instead. */) /* All remaining specified parameters, which have not been "used" by x_get_arg and friends, now go in the misc. alist of the frame. */ - for (tem = parms; !NILP (tem); tem = XCDR (tem)) + for (tem = parms; CONSP (tem); tem = XCDR (tem)) if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem)))) f->param_alist = Fcons (XCAR (tem), f->param_alist); @@ -3498,6 +3495,7 @@ FRAME nil means use the selected frame. */) x_catch_errors (dpy); XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), RevertToParent, CurrentTime); + x_ewmh_activate_frame (f); x_uncatch_errors (); UNBLOCK_INPUT; @@ -3541,10 +3539,10 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0, DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, doc: /* Internal function called by `display-color-p', which see. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (dpyinfo->n_planes <= 2) return Qnil; @@ -3566,13 +3564,13 @@ DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p, 0, 1, 0, doc: /* Return t if the X display supports shades of gray. Note that color displays do support shades of gray. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (dpyinfo->n_planes <= 1) return Qnil; @@ -3594,56 +3592,56 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, 0, 1, 0, - doc: /* Return the width in pixels of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the width in pixels of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->width); } DEFUN ("x-display-pixel-height", Fx_display_pixel_height, Sx_display_pixel_height, 0, 1, 0, - doc: /* Return the height in pixels of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the height in pixels of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->height); } DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, 0, 1, 0, - doc: /* Return the number of bitplanes of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the number of bitplanes of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (dpyinfo->n_planes); } DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, 0, 1, 0, - doc: /* Return the number of color cells of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the number of color cells of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); int nr_planes = DisplayPlanes (dpyinfo->display, XScreenNumberOfScreen (dpyinfo->screen)); @@ -3661,29 +3659,29 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_request_size, 0, 1, 0, - doc: /* Return the maximum request size of the X server of display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the maximum request size of the X server of display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (MAXREQUEST (dpyinfo->display)); } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Return the "vendor ID" string of the X server of display DISPLAY. + doc: /* Return the "vendor ID" string of the X server of display TERMINAL. \(Labelling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); char *vendor = ServerVendor (dpyinfo->display); if (! vendor) vendor = ""; @@ -3691,18 +3689,18 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Return the version numbers of the X server of display DISPLAY. + doc: /* Return the version numbers of the X server of display TERMINAL. The value is a list of three integers: the major and minor version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Display *dpy = dpyinfo->display; return Fcons (make_number (ProtocolVersion (dpy)), @@ -3711,55 +3709,55 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, - doc: /* Return the number of screens on the X server of display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the number of screens on the X server of display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (ScreenCount (dpyinfo->display)); } DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, - doc: /* Return the height in millimeters of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the height in millimeters of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (HeightMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, - doc: /* Return the width in millimeters of the X display DISPLAY. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return the width in millimeters of the X display TERMINAL. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); return make_number (WidthMMOfScreen (dpyinfo->screen)); } DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Return an indication of whether X display DISPLAY does backing store. + doc: /* Return an indication of whether X display TERMINAL does backing store. The value may be `always', `when-mapped', or `not-useful'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Lisp_Object result; switch (DoesBackingStore (dpyinfo->screen)) @@ -3786,17 +3784,17 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Return the visual class of the X display DISPLAY. + doc: /* Return the visual class of the X display TERMINAL. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); Lisp_Object result; switch (dpyinfo->visual->class) @@ -3829,14 +3827,14 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-save-under", Fx_display_save_under, Sx_display_save_under, 0, 1, 0, - doc: /* Return t if the X display DISPLAY supports the save-under feature. -The optional argument DISPLAY specifies which display to ask about. -DISPLAY should be either a frame or a display name (a string). + doc: /* Return t if the X display TERMINAL supports the save-under feature. +The optional argument TERMINAL specifies which display to ask about. +TERMINAL should be a terminal id, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (DoesSaveUnders (dpyinfo->screen) == True) return Qt; @@ -3988,11 +3986,7 @@ select_visual (dpyinfo) dpyinfo->visual = DefaultVisualOfScreen (screen); -#ifdef HAVE_X11R4 vinfo_template.visualid = XVisualIDFromVisual (dpyinfo->visual); -#else - vinfo_template.visualid = dpyinfo->visual->visualid; -#endif vinfo_template.screen = XScreenNumberOfScreen (screen); vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask, &vinfo_template, &n_visuals); @@ -4017,8 +4011,10 @@ x_display_info_for_name (name) CHECK_STRING (name); - if (! EQ (Vwindow_system, intern ("x"))) - error ("Not using X Windows"); +#if 0 + if (! EQ (Vinitial_window_system, intern ("x"))) + error ("Not using X Windows"); /* That doesn't stop us anymore. */ +#endif for (dpyinfo = x_display_list, names = x_display_name_list; dpyinfo; @@ -4065,8 +4061,10 @@ terminate Emacs if we can't open the connection. */) if (! NILP (xrm_string)) CHECK_STRING (xrm_string); - if (! EQ (Vwindow_system, intern ("x"))) - error ("Not using X Windows"); +#if 0 + if (! EQ (Vinitial_window_system, intern ("x"))) + error ("Not using X Windows"); /* That doesn't stop us anymore. */ +#endif if (! NILP (xrm_string)) xrm_option = (unsigned char *) SDATA (xrm_string); @@ -4101,41 +4099,19 @@ An insecure way to solve the problem may be to use `xhost'.\n", DEFUN ("x-close-connection", Fx_close_connection, Sx_close_connection, 1, 1, 0, - doc: /* Close the connection to DISPLAY's X server. -For DISPLAY, specify either a frame or a display name (a string). -If DISPLAY is nil, that stands for the selected frame's display. */) - (display) - Lisp_Object display; + doc: /* Close the connection to TERMINAL's X server. +For TERMINAL, specify a terminal id, a frame or a display name (a +string). If TERMINAL is nil, that stands for the selected frame's +terminal. */) + (terminal) + Lisp_Object terminal; { - struct x_display_info *dpyinfo = check_x_display_info (display); - int i; + struct x_display_info *dpyinfo = check_x_display_info (terminal); if (dpyinfo->reference_count > 0) error ("Display still has frames on it"); - BLOCK_INPUT; - /* Free the fonts in the font table. */ - for (i = 0; i < dpyinfo->n_fonts; i++) - if (dpyinfo->font_table[i].name) - { - XFreeFont (dpyinfo->display, dpyinfo->font_table[i].font); - } - - x_destroy_all_bitmaps (dpyinfo); - XSetCloseDownMode (dpyinfo->display, DestroyAll); - -#ifdef USE_GTK - xg_display_close (dpyinfo->display); -#else -#ifdef USE_X_TOOLKIT - XtCloseDisplay (dpyinfo->display); -#else - XCloseDisplay (dpyinfo->display); -#endif -#endif /* ! USE_GTK */ - - x_delete_display (dpyinfo); - UNBLOCK_INPUT; + x_delete_terminal (dpyinfo->terminal); return Qnil; } @@ -4147,7 +4123,7 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0, Lisp_Object tail, result; result = Qnil; - for (tail = x_display_name_list; ! NILP (tail); tail = XCDR (tail)) + for (tail = x_display_name_list; CONSP (tail); tail = XCDR (tail)) result = Fcons (XCAR (XCAR (tail)), result); return result; @@ -4159,13 +4135,13 @@ If ON is nil, allow buffering of requests. Turning on synchronization prohibits the Xlib routines from buffering requests and seriously degrades performance, but makes debugging much easier. -The optional second argument DISPLAY specifies which display to act on. -DISPLAY should be either a frame or a display name (a string). -If DISPLAY is omitted or nil, that stands for the selected frame's display. */) - (on, display) - Lisp_Object display, on; +The optional second argument TERMINAL specifies which display to act on. +TERMINAL should be a terminal id, a frame or a display name (a string). +If TERMINAL is omitted or nil, that stands for the selected frame's display. */) + (on, terminal) + Lisp_Object terminal, on; { - struct x_display_info *dpyinfo = check_x_display_info (display); + struct x_display_info *dpyinfo = check_x_display_info (terminal); XSynchronize (dpyinfo->display, !EQ (on, Qnil)); @@ -4469,10 +4445,6 @@ start_hourglass () EMACS_TIME delay; int secs, usecs = 0; - /* Don't bother for ttys. */ - if (NILP (Vwindow_system)) - return; - cancel_hourglass (); if (INTEGERP (Vhourglass_delay) @@ -4684,20 +4656,16 @@ x_create_tip_frame (dpyinfo, parms, text) int width, height; int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3; - struct kboard *kb; int face_change_count_before = face_change_count; Lisp_Object buffer; struct buffer *old_buffer; check_x (); - parms = Fcopy_alist (parms); + if (!dpyinfo->terminal->name) + error ("Terminal is not live, can't create new frames on it"); -#ifdef MULTI_KBOARD - kb = dpyinfo->kboard; -#else - kb = &the_only_kboard; -#endif + parms = Fcopy_alist (parms); /* Get the name of the frame to use for resource lookup. */ name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); @@ -4725,6 +4693,9 @@ x_create_tip_frame (dpyinfo, parms, text) FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; record_unwind_protect (unwind_create_tip_frame, frame); + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; + /* By setting the output method, we're essentially saying that the frame is live, as per FRAME_LIVE_P. If we get a signal from this point on, x_destroy_window might screw up reference @@ -4746,9 +4717,6 @@ x_create_tip_frame (dpyinfo, parms, text) image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD - FRAME_KBOARD (f) = kb; -#endif f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; f->output_data.x->explicit_parent = 0; @@ -4758,11 +4726,21 @@ x_create_tip_frame (dpyinfo, parms, text) Lisp_Object black; struct gcpro gcpro1; + /* Function x_decode_color can signal an error. Make + sure to initialize color slots so that we won't try + to free colors we haven't allocated. */ + FRAME_FOREGROUND_PIXEL (f) = -1; + FRAME_BACKGROUND_PIXEL (f) = -1; + f->output_data.x->cursor_pixel = -1; + f->output_data.x->cursor_foreground_pixel = -1; + f->output_data.x->border_pixel = -1; + f->output_data.x->mouse_pixel = -1; + black = build_string ("black"); GCPRO1 (black); - f->output_data.x->foreground_pixel + FRAME_FOREGROUND_PIXEL (f) = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); - f->output_data.x->background_pixel + FRAME_BACKGROUND_PIXEL (f) = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); f->output_data.x->cursor_pixel = x_decode_color (f, black, BLACK_PIX_DEFAULT (f)); |