X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/01492d1b7c916d117bce7d634243f2132437f270..974aae61bbb8c05e0d0fc1a95b419fe596423fd8:/src/widget.c diff --git a/src/widget.c b/src/widget.c index e93fbaf5c6..fdd927cb17 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,5 @@ /* The emacs frame widget. - Copyright (C) 1992, 1993 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,19 +15,32 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Emacs 19 face widget ported by Fred Pierresteguy */ +/* This file has been censored by the Communications Decency Act. + That law was passed under the guise of a ban on pornography, but + it bans far more than that. This file did not contain pornography, + but it was censored nonetheless. + + For information on US government censorship of the Internet, and + what you can do to bring back freedom of the press, see the web + site http://www.vtw.org/ + */ + +#include #include -#include "config.h" #include "lisp.h" #include "xterm.h" +#include "keyboard.h" #include "frame.h" +#include "window.h" #include "dispextern.h" - +#include "blockinput.h" #include #include @@ -36,8 +49,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include #include #include +#include "../lwlib/lwlib.h" -#define max(a, b) ((a) > (b) ? (a) : (b)) +#include +#include "syssignal.h" /* This sucks: this is the first default that x-faces.el tries. This won't be used unless neither the "Emacs.EmacsFrame" resource nor the @@ -167,14 +182,9 @@ get_default_char_pixel_size (ew, pixel_width, pixel_height) int* pixel_width; int* pixel_height; { -/* - *pixel_width = XTextWidth (ew->emacs_frame.font, "n", 1); - *pixel_height = - ew->emacs_frame.font->ascent + ew->emacs_frame.font->descent; -*/ struct frame* f = ew->emacs_frame.frame; - *pixel_width = FONT_WIDTH (f->display.x->font); - *pixel_height = FONT_HEIGHT (f->display.x->font); + *pixel_width = FRAME_COLUMN_WIDTH (f); + *pixel_height = FRAME_LINE_HEIGHT (f); } static void @@ -186,23 +196,30 @@ pixel_to_char_size (ew, pixel_width, pixel_height, char_width, char_height) int* char_height; { struct frame* f = ew->emacs_frame.frame; - *char_width = PIXEL_TO_CHAR_WIDTH (f, pixel_width); - *char_height = PIXEL_TO_CHAR_HEIGHT (f, pixel_height); + *char_width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, (int) pixel_width); + *char_height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (int) pixel_height); } static void -char_to_pixel_size (EmacsFrame ew, int char_width, int char_height, - Dimension* pixel_width, Dimension* pixel_height) +char_to_pixel_size (ew, char_width, char_height, pixel_width, pixel_height) + EmacsFrame ew; + int char_width; + int char_height; + Dimension* pixel_width; + Dimension* pixel_height; { struct frame* f = ew->emacs_frame.frame; - *pixel_width = CHAR_TO_PIXEL_WIDTH (f, char_width); - *pixel_height = CHAR_TO_PIXEL_HEIGHT (f, char_height); + *pixel_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, char_width); + *pixel_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, char_height); } static void -round_size_to_char (EmacsFrame ew, - Dimension in_width, Dimension in_height, - Dimension* out_width, Dimension* out_height) +round_size_to_char (ew, in_width, in_height, out_width, out_height) + EmacsFrame ew; + Dimension in_width; + Dimension in_height; + Dimension* out_width; + Dimension* out_height; { int char_width; int char_height; @@ -211,7 +228,8 @@ round_size_to_char (EmacsFrame ew, } static Widget -get_wm_shell (Widget w) +get_wm_shell (w) + Widget w; { Widget wmshell; @@ -222,8 +240,11 @@ get_wm_shell (Widget w) return wmshell; } +#if 0 /* Currently not used. */ + static void -mark_shell_size_user_specified (Widget wmshell) +mark_shell_size_user_specified (wmshell) + Widget wmshell; { if (! XtIsWMShell (wmshell)) abort (); /* This is kind of sleazy, but I can't see how else to tell it to make it @@ -231,6 +252,8 @@ mark_shell_size_user_specified (Widget wmshell) ((WMShellWidget) wmshell)->wm.size_hints.flags |= USSize; } +#endif + /* Can't have static frame locals because of some broken compilers. Normally, initializing a variable like this doesn't work in emacs, @@ -238,10 +261,13 @@ mark_shell_size_user_specified (Widget wmshell) thus have its data not go into text space) because Xt needs to write to initialized data objects too. */ +#if 0 static Boolean first_frame_p = True; +#endif static void -set_frame_size (EmacsFrame ew) +set_frame_size (ew) + EmacsFrame ew; { /* The widget hierarchy is @@ -270,7 +296,7 @@ set_frame_size (EmacsFrame ew) (the menubar and the parent of the menubar and all that sort of thing are managed by lwlib.) - The EmacsShell widget is simply a replacement for the Shell widget + The EmacsShell widget is simply a replacement for the Shell widget which is able to deal with using an externally-supplied window instead of always creating its own. It is not actually emacs specific, and should possibly have class "Shell" instead of "EmacsShell" to simplify @@ -278,58 +304,42 @@ set_frame_size (EmacsFrame ew) */ - /* Geometry of the AppShell */ - int app_flags = 0; - int app_x = 0; - int app_y = 0; - unsigned int app_w = 0; - unsigned int app_h = 0; - - /* Geometry of the EmacsFrame */ - int frame_flags = 0; - int frame_x = 0; - int frame_y = 0; - unsigned int frame_w = 0; - unsigned int frame_h = 0; - /* Hairily merged geometry */ - int x = 0; - int y = 0; - unsigned int w = ew->emacs_frame.frame->width; - unsigned int h = ew->emacs_frame.frame->height; - int flags = 0; - + unsigned int w = FRAME_COLS (ew->emacs_frame.frame); + unsigned int h = FRAME_LINES (ew->emacs_frame.frame); + Widget wmshell = get_wm_shell ((Widget) ew); - Widget app_shell = XtParent ((Widget) wmshell); - - + /* Each Emacs shell is now independent and top-level. */ + if (! XtIsSubclass (wmshell, shellWidgetClass)) abort (); - if (! XtIsSubclass (app_shell, shellWidgetClass)) abort (); + /* We don't need this for the moment. The geometry is computed in + xfns.c. */ +#if 0 /* If the EmacsFrame doesn't have a geometry but the shell does, treat that as the geometry of the frame. (Is this bogus? I'm not sure.) */ if (ew->emacs_frame.geometry == 0) - XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, 0); + XtVaGetValues (wmshell, XtNgeometry, &ew->emacs_frame.geometry, NULL); /* If the Shell is iconic, then the EmacsFrame is iconic. (Is this bogus? I'm not sure.) */ if (!ew->emacs_frame.iconic) - XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, 0); - - + XtVaGetValues (wmshell, XtNiconic, &ew->emacs_frame.iconic, NULL); + + { char *geom = 0; - XtVaGetValues (app_shell, XtNgeometry, &geom, 0); + XtVaGetValues (app_shell, XtNgeometry, &geom, NULL); if (geom) app_flags = XParseGeometry (geom, &app_x, &app_y, &app_w, &app_h); } - + if (ew->emacs_frame.geometry) frame_flags = XParseGeometry (ew->emacs_frame.geometry, &frame_x, &frame_y, &frame_w, &frame_h); - + if (first_frame_p) { /* If this is the first frame created: @@ -370,7 +380,7 @@ set_frame_size (EmacsFrame ew) /* If the AppShell is iconic, then the EmacsFrame is iconic. */ if (!ew->emacs_frame.iconic) - XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, 0); + XtVaGetValues (app_shell, XtNiconic, &ew->emacs_frame.iconic, NULL); first_frame_p = False; } @@ -408,25 +418,31 @@ set_frame_size (EmacsFrame ew) flags |= (app_flags & (WidthValue | HeightValue)); } } - +#endif /* 0 */ { - struct frame* frame = ew->emacs_frame.frame; + struct frame *f = ew->emacs_frame.frame; Dimension pixel_width, pixel_height; - char shell_position [32]; - /* Take into account the size of the scrollbar */ - frame->display.x->vertical_scroll_bar_extra - = (FRAME_HAS_VERTICAL_SCROLL_BARS (frame) - ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (frame) - : 0); + /* Take into account the size of the scrollbar. Always use the + number of columns occupied by the scroll bar here otherwise we + might end up with a frame width that is not a multiple of the + frame's character width which is bad for vertically split + windows. */ + f->scroll_bar_actual_width + = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); + compute_fringe_widths (f, 0); - change_frame_size (frame, h, w, 1, 0); +#if 0 /* This can run Lisp code, and it is dangerous to give + out the frame to Lisp code before it officially exists. + This is handled in Fx_create_frame so not needed here. */ + change_frame_size (f, h, w, 1, 0, 0); +#endif char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height); ew->core.width = pixel_width; ew->core.height = pixel_height; - +#if 0 /* xfns.c takes care of this now. */ /* If a position was specified, assign it to the shell widget. (Else WM won't do anything with it.) */ @@ -442,7 +458,7 @@ set_frame_size (EmacsFrame ew) len = strlen (shell_position) + 1; tem = (char *) xmalloc (len); strncpy (tem, shell_position, len); - XtVaSetValues (wmshell, XtNgeometry, tem, 0); + XtVaSetValues (wmshell, XtNgeometry, tem, NULL); } else if (flags & (WidthValue | HeightValue)) { @@ -452,7 +468,7 @@ set_frame_size (EmacsFrame ew) len = strlen (shell_position) + 1; tem = (char *) xmalloc (len); strncpy (tem, shell_position, len); - XtVaSetValues (wmshell, XtNgeometry, tem, 0); + XtVaSetValues (wmshell, XtNgeometry, tem, NULL); } /* If the geometry spec we're using has W/H components, mark the size @@ -462,13 +478,18 @@ set_frame_size (EmacsFrame ew) /* Also assign the iconic status of the frame to the Shell, so that the WM sees it. */ - XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0); + XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, NULL); +#endif /* 0 */ } } +/* Nonzero tells update_wm_hints not to do anything + (the caller should call update_wm_hints explicitly later.) */ +int update_hints_inhibit; static void -update_wm_hints (EmacsFrame ew) +update_wm_hints (ew) + EmacsFrame ew; { Widget wmshell = get_wm_shell ((Widget)ew); int cw; @@ -481,13 +502,18 @@ update_wm_hints (EmacsFrame ew) int base_height; int min_rows = 0, min_cols = 0; + if (update_hints_inhibit) + return; + +#if 0 check_frame_size (ew->emacs_frame.frame, &min_rows, &min_cols); +#endif pixel_to_char_size (ew, ew->core.width, ew->core.height, &char_width, &char_height); char_to_pixel_size (ew, char_width, char_height, &rounded_width, &rounded_height); - get_default_char_pixel_size (ew, &cw, &ch); + get_default_char_pixel_size (ew, &cw, &ch); base_width = (wmshell->core.width - ew->core.width + (rounded_width - (char_width * cw))); @@ -500,43 +526,54 @@ update_wm_hints (EmacsFrame ew) /* ((WMShellWidget) wmshell)->wm.size_hints.flags |= USSize;*/ XtVaSetValues (wmshell, - XtNbaseWidth, base_width, - XtNbaseHeight, base_height, - XtNwidthInc, cw, - XtNheightInc, ch, - XtNminWidth, base_width + min_cols * cw, - XtNminHeight, base_height + min_rows * ch, - 0); + XtNbaseWidth, (XtArgVal) base_width, + XtNbaseHeight, (XtArgVal) base_height, + XtNwidthInc, (XtArgVal) cw, + XtNheightInc, (XtArgVal) ch, + XtNminWidth, (XtArgVal) (base_width + min_cols * cw), + XtNminHeight, (XtArgVal) (base_height + min_rows * ch), + NULL); } +#if 0 + static void -create_frame_gcs (EmacsFrame ew) +create_frame_gcs (ew) + EmacsFrame ew; { - struct frame* s = ew->emacs_frame.frame; - - s->display.x->normal_gc = - XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); - s->display.x->reverse_gc = - XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); - s->display.x->cursor_gc = - XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); + struct frame *s = ew->emacs_frame.frame; + + s->output_data.x->normal_gc + = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), + (unsigned long)0, (XGCValues *)0); + s->output_data.x->reverse_gc + = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), + (unsigned long)0, (XGCValues *)0); + s->output_data.x->cursor_gc + = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), + (unsigned long)0, (XGCValues *)0); + s->output_data.x->black_relief.gc = 0; + s->output_data.x->white_relief.gc = 0; } +#endif /* 0 */ + +static char setup_frame_cursor_bits[] = +{ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + static void -setup_frame_gcs (EmacsFrame ew) +setup_frame_gcs (ew) + EmacsFrame ew; { XGCValues gc_values; struct frame* s = ew->emacs_frame.frame; Pixmap blank_stipple, blank_tile; - static char cursor_bits[] = - { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - /* We have to initialize all of our GCs to have a stipple/tile, otherwise XGetGCValues returns uninitialized data when we query the stipple (instead of None or something sensible) and it makes things hard. @@ -546,17 +583,20 @@ setup_frame_gcs (EmacsFrame ew) effectively cache all of the GC settings we need to use. */ - blank_stipple = - XCreateBitmapFromData (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), - cursor_bits, 2, 2); + blank_stipple + = XCreateBitmapFromData (XtDisplay (ew), + RootWindowOfScreen (XtScreen (ew)), + setup_frame_cursor_bits, 2, 2); /* use fg = 0, bg = 1 below, but it's irrelevant since this pixmap should never actually get used as a background tile! */ - blank_tile = - XCreatePixmapFromBitmapData (XtDisplay(ew), - RootWindowOfScreen (XtScreen (ew)), - cursor_bits, 2, 2, 0, 1, ew->core.depth); + blank_tile + = XCreatePixmapFromBitmapData (XtDisplay(ew), + RootWindowOfScreen (XtScreen (ew)), + setup_frame_cursor_bits, 2, 2, + (unsigned long)0, (unsigned long)1, + ew->core.depth); /* Normal video */ gc_values.font = ew->emacs_frame.font->fid; @@ -565,7 +605,7 @@ setup_frame_gcs (EmacsFrame ew) gc_values.graphics_exposures = False; gc_values.stipple = blank_stipple; gc_values.tile = blank_tile; - XChangeGC (XtDisplay (ew), s->display.x->normal_gc, + XChangeGC (XtDisplay (ew), s->output_data.x->normal_gc, (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCStipple | GCTile), &gc_values); @@ -577,7 +617,7 @@ setup_frame_gcs (EmacsFrame ew) gc_values.graphics_exposures = False; gc_values.stipple = blank_stipple; gc_values.tile = blank_tile; - XChangeGC (XtDisplay (ew), s->display.x->reverse_gc, + XChangeGC (XtDisplay (ew), s->output_data.x->reverse_gc, (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCStipple | GCTile), &gc_values); @@ -588,43 +628,50 @@ setup_frame_gcs (EmacsFrame ew) gc_values.background = ew->emacs_frame.cursor_color; gc_values.graphics_exposures = False; gc_values.tile = blank_tile; - gc_values.stipple = - XCreateBitmapFromData (XtDisplay (ew), - RootWindowOfScreen (XtScreen (ew)), - cursor_bits, 16, 16); - XChangeGC (XtDisplay (ew), s->display.x->cursor_gc, + gc_values.stipple + = XCreateBitmapFromData (XtDisplay (ew), + RootWindowOfScreen (XtScreen (ew)), + setup_frame_cursor_bits, 16, 16); + XChangeGC (XtDisplay (ew), s->output_data.x->cursor_gc, (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCStipple | GCTile), &gc_values); } static void -update_various_frame_slots (EmacsFrame ew) +update_various_frame_slots (ew) + EmacsFrame ew; { - struct x_display* x = ew->emacs_frame.frame->display.x; - x->pixel_height = ew->core.height; - x->pixel_width = ew->core.width; - x->internal_border_width = ew->emacs_frame.internal_border_width; + struct frame *f = ew->emacs_frame.frame; + struct x_output *x = f->output_data.x; + FRAME_PIXEL_HEIGHT (f) = ew->core.height + x->menubar_height; + FRAME_PIXEL_WIDTH (f) = ew->core.width; + f->internal_border_width = ew->emacs_frame.internal_border_width; } static void -update_from_various_frame_slots (EmacsFrame ew) +update_from_various_frame_slots (ew) + EmacsFrame ew; { - struct x_display* x = ew->emacs_frame.frame->display.x; - ew->core.height = x->pixel_height; - ew->core.width = x->pixel_width; + struct frame *f = ew->emacs_frame.frame; + struct x_output *x = f->output_data.x; + ew->core.height = FRAME_PIXEL_HEIGHT (f) - x->menubar_height; + ew->core.width = FRAME_PIXEL_WIDTH (f); ew->core.background_pixel = x->background_pixel; - ew->emacs_frame.internal_border_width = x->internal_border_width; + ew->emacs_frame.internal_border_width = f->internal_border_width; ew->emacs_frame.font = x->font; ew->emacs_frame.foreground_pixel = x->foreground_pixel; ew->emacs_frame.cursor_color = x->cursor_pixel; ew->core.border_pixel = x->border_pixel; } -static void -EmacsFrameInitialize (Widget request, Widget new, - ArgList dum1, Cardinal *dum2) +static void +EmacsFrameInitialize (request, new, dum1, dum2) + Widget request; + Widget new; + ArgList dum1; + Cardinal *dum2; { EmacsFrame ew = (EmacsFrame)new; @@ -658,7 +705,7 @@ EmacsFrameInitialize (Widget request, Widget new, face_res.default_addr = 0; XtGetSubresources ((Widget) ew, (XtPointer) &f, "default", "Face", &face_res, 1, NULL, 0); - + if (f) ew->emacs_frame.font = f; else if (! ew->emacs_frame.font) @@ -669,11 +716,11 @@ EmacsFrameInitialize (Widget request, Widget new, } /* Update the font field in frame */ - ew->emacs_frame.frame->display.x->font = ew->emacs_frame.font; + FRAME_FONT (ew->emacs_frame.frame) = ew->emacs_frame.font; #endif update_from_various_frame_slots (ew); - set_frame_size (ew); + set_frame_size (ew); /*create_frame_gcs (ew); setup_frame_gcs (ew); update_various_frame_slots (ew); */ @@ -681,49 +728,49 @@ EmacsFrameInitialize (Widget request, Widget new, static void -EmacsFrameRealize (Widget widget, XtValueMask *mask, - XSetWindowAttributes *attrs) +EmacsFrameRealize (widget, mask, attrs) + Widget widget; + XtValueMask *mask; + XSetWindowAttributes *attrs; { EmacsFrame ew = (EmacsFrame)widget; - attrs->event_mask = (KeyPressMask | ExposureMask | ButtonPressMask | - ButtonReleaseMask | StructureNotifyMask | - FocusChangeMask | PointerMotionHintMask | - PointerMotionMask | LeaveWindowMask | EnterWindowMask | - VisibilityChangeMask | PropertyChangeMask | - StructureNotifyMask | SubstructureNotifyMask | - SubstructureRedirectMask); + /* This used to contain SubstructureRedirectMask, but this turns out + to be a problem with XIM on Solaris, and events from that mask + don't seem to be used. Let's check that. */ + attrs->event_mask = (STANDARD_EVENT_SET + | PropertyChangeMask + | SubstructureNotifyMask); *mask |= CWEventMask; XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask, attrs); - update_wm_hints (ew); + update_wm_hints (ew); } -extern void free_frame_faces (struct frame *); +extern void free_frame_faces (/* struct frame * */); static void -EmacsFrameDestroy (Widget widget) +EmacsFrameDestroy (widget) + Widget widget; { EmacsFrame ew = (EmacsFrame) widget; struct frame* s = ew->emacs_frame.frame; if (! s) abort (); - if (! s->display.x) abort (); - if (! s->display.x->normal_gc) abort (); - - /* this would be called from Fdelete_frame() but it needs to free some - stuff after the widget has been finalized but before the widget has - been freed. */ - free_frame_faces (s); - - /* need to be careful that the face-freeing code doesn't free these too */ - XFreeGC (XtDisplay (widget), s->display.x->normal_gc); - XFreeGC (XtDisplay (widget), s->display.x->reverse_gc); - XFreeGC (XtDisplay (widget), s->display.x->cursor_gc); + if (! s->output_data.x) abort (); + + BLOCK_INPUT; + x_free_gcs (s); + if (s->output_data.x->white_relief.gc) + XFreeGC (XtDisplay (widget), s->output_data.x->white_relief.gc); + if (s->output_data.x->black_relief.gc) + XFreeGC (XtDisplay (widget), s->output_data.x->black_relief.gc); + UNBLOCK_INPUT; } void -EmacsFrameResize (Widget widget) +EmacsFrameResize (widget) + Widget widget; { EmacsFrame ew = (EmacsFrame)widget; struct frame *f = ew->emacs_frame.frame; @@ -731,39 +778,20 @@ EmacsFrameResize (Widget widget) int rows; pixel_to_char_size (ew, ew->core.width, ew->core.height, &columns, &rows); - change_frame_size (f, rows, columns, 1, 0); - update_wm_hints (ew); - { - Window win, child; - int win_x, win_y; - - /* Find the position of the outside upper-left corner of - the window, in the root coordinate system. Don't - refer to the parent window here; we may be processing - this event after the window manager has changed our - parent, but before we have reached the ReparentNotify. */ - XTranslateCoordinates (x_current_display, - - /* From-window, to-window. */ - XtWindow(XtParent(ew)), - ROOT_WINDOW, - - /* From-position, to-position. */ - -f->display.x->widget->core.border_width, - -f->display.x->widget->core.border_width, - &win_x, &win_y, - - /* Child of win. */ - &child); - f->display.x->widget->core.x = win_x; - f->display.x->widget->core.y = win_y; - } + change_frame_size (f, rows, columns, 0, 1, 0); + update_wm_hints (ew); update_various_frame_slots (ew); + + cancel_mouse_face (f); } static Boolean -EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, - ArgList dum1, Cardinal *dum2) +EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2) + Widget cur_widget; + Widget req_widget; + Widget new_widget; + ArgList dum1; + Cardinal *dum2; { EmacsFrame cur = (EmacsFrame)cur_widget; EmacsFrame new = (EmacsFrame)new_widget; @@ -776,14 +804,14 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, int char_width, char_height; Dimension pixel_width; Dimension pixel_height; - + has_to_recompute_gcs = (cur->emacs_frame.font != new->emacs_frame.font || (cur->emacs_frame.foreground_pixel != new->emacs_frame.foreground_pixel) || (cur->core.background_pixel != new->core.background_pixel) ); - + has_to_recompute_size = (cur->emacs_frame.font != new->emacs_frame.font && cur->core.width == new->core.width && cur->core.height == new->core.height); @@ -795,7 +823,7 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, setup_frame_gcs (new); needs_a_refresh = True; } - + if (has_to_recompute_size) { pixel_width = new->core.width; @@ -808,7 +836,7 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, new->core.height = pixel_height; change_frame_size (new->emacs_frame.frame, char_height, char_width, - 1, 0); + 1, 0, 0); needs_a_refresh = True; } @@ -820,22 +848,25 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, /* #### This doesn't work, I haven't been able to find ANY kludge that will let (x-create-frame '((iconic . t))) work. It seems that changes to wm_shell's iconic slot have no effect after it has been realized, - and calling XIconifyWindow doesn't work either (even thought the window + and calling XIconifyWindow doesn't work either (even though the window has been created.) Perhaps there is some property we could smash - directly, but I'm sick of this for now. Xt is a steaming pile of shit! + directly, but I'm sick of this for now. */ if (cur->emacs_frame.iconic != new->emacs_frame.iconic) { Widget wmshell = get_wm_shell ((Widget) cur); - XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, 0); + XtVaSetValues (wmshell, XtNiconic, + (XtArgVal) new->emacs_frame.iconic, NULL); } return needs_a_refresh; } static XtGeometryResult -EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry* request, - XtWidgetGeometry* result) +EmacsFrameQueryGeometry (widget, request, result) + Widget widget; + XtWidgetGeometry* request; + XtWidgetGeometry* result; { EmacsFrame ew = (EmacsFrame)widget; @@ -863,44 +894,127 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry* request, return result->request_mode ? XtGeometryAlmost : XtGeometryYes; } -#if 0 -/* I don't know why this is necessary; Matthieu said he had to do - it to make the focus handlers work?? - */ -static void -key_press (Widget w, XEvent* event, String *params, Cardinal *n_params) -{ -} - -static void -emacs_frame_focus_handler (Widget w, XEvent *event, String *params, - Cardinal *n_params) -{ - emacs_Xt_focus_event_handler (event, 0); -} -#endif - /* Special entrypoints */ void -EmacsFrameSetCharSize (Widget widget, int columns, int rows) +EmacsFrameSetCharSize (widget, columns, rows) + Widget widget; + int columns; + int rows; { EmacsFrame ew = (EmacsFrame) widget; - Dimension pixel_width, pixel_height, granted_width, granted_height; - XtGeometryResult result; + Dimension pixel_width, pixel_height; + struct frame *f = ew->emacs_frame.frame; + if (columns < 3) columns = 3; /* no way buddy */ - if (rows < 3) rows = 3; + + check_frame_size (f, &rows, &columns); + f->scroll_bar_actual_width + = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); + + compute_fringe_widths (f, 0); char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height); - result = XtMakeResizeRequest ((Widget)ew, - pixel_width, pixel_height, - &granted_width, &granted_height); - if (result == XtGeometryAlmost) - XtMakeResizeRequest ((Widget) ew, granted_width, granted_height, - NULL, NULL); - /* damn Paned widget won't ever change its width. Force it. */ - if (ew->core.width != pixel_width) + +#if 0 /* This doesn't seem to be right. The frame gets too wide. --gerd. */ + /* Something is really strange here wrt to the border width: + Apparently, XtNwidth and XtNheight include the border, so we have + to add it here. But the XtNborderWidth set for the widgets has + no similarity to what f->border_width is set to. */ + XtVaGetValues (widget, XtNborderWidth, &border_width, NULL); + pixel_height += 2 * border_width; + pixel_width += 2 * border_width; +#endif + + /* Manually change the height and width of all our widgets, + adjusting each widget by the same increments. */ + if (ew->core.width != pixel_width + || ew->core.height != pixel_height) { - XtVaSetValues (XtParent ((Widget) ew), XtNwidth, pixel_width, 0); - XtVaSetValues ((Widget) ew, XtNwidth, pixel_width, 0); + int hdelta = pixel_height - ew->core.height; + int wdelta = pixel_width - ew->core.width; + int column_widget_height = f->output_data.x->column_widget->core.height; + int column_widget_width = f->output_data.x->column_widget->core.width; + int outer_widget_height = f->output_data.x->widget->core.height; + int outer_widget_width = f->output_data.x->widget->core.width; + int old_left = f->output_data.x->widget->core.x; + int old_top = f->output_data.x->widget->core.y; + + /* Input is blocked here, and Xt waits for some event to + occur. */ + + lw_refigure_widget (f->output_data.x->column_widget, False); + update_hints_inhibit = 1; + + /* Xt waits for a ConfigureNotify event from the window manager + in EmacsFrameSetCharSize when the shell widget is resized. + For some window managers like fvwm2 2.2.5 and KDE 2.1 this + event doesn't arrive for an unknown reason and Emacs hangs in + Xt when the default font is changed. Tell Xt not to wait, + depending on the value of the frame parameter + `wait-for-wm'. */ + XtVaSetValues (f->output_data.x->widget, + XtNwaitForWm, (XtArgVal) f->output_data.x->wait_for_wm, + NULL); + + /* Workaround: When a SIGIO or SIGALRM occurs while Xt is + waiting for a ConfigureNotify event (see above), this leads + to Xt waiting indefinitely instead of using its default + timeout (5 seconds). */ + turn_on_atimers (0); +#ifdef SIGIO + sigblock (sigmask (SIGIO)); +#endif + + /* Do parents first, otherwise LessTif's geometry management + enters an infinite loop (as of 2000-01-15). This is fixed in + later versions of LessTif (as of 2001-03-13); I'll leave it + as is because I think it can't do any harm. */ + /* In April 2002, simon.marshall@misys.com reports the problem + seems not to occur any longer. */ + XtVaSetValues (f->output_data.x->widget, + XtNheight, (XtArgVal) (outer_widget_height + hdelta), + XtNwidth, (XtArgVal) (outer_widget_width + wdelta), + NULL); + XtVaSetValues (f->output_data.x->column_widget, + XtNheight, (XtArgVal) (column_widget_height + hdelta), + XtNwidth, (XtArgVal) column_widget_width + wdelta, + NULL); + XtVaSetValues ((Widget) ew, + XtNheight, (XtArgVal) pixel_height, + XtNwidth, (XtArgVal) pixel_width, + NULL); +#ifdef SIGIO + sigunblock (sigmask (SIGIO)); +#endif + turn_on_atimers (1); + + lw_refigure_widget (f->output_data.x->column_widget, True); + + update_hints_inhibit = 0; + update_wm_hints (ew); + + /* These seem to get clobbered. I don't know why. - rms. */ + f->output_data.x->widget->core.x = old_left; + f->output_data.x->widget->core.y = old_top; } + + /* We've set {FRAME,PIXEL}_{WIDTH,HEIGHT} to the values we hope to + receive in the ConfigureNotify event; if we get what we asked + for, then the event won't cause the screen to become garbaged, so + we have to make sure to do it here. */ + SET_FRAME_GARBAGED (f); +} + + +void +widget_store_internal_border (widget) + Widget widget; +{ + EmacsFrame ew = (EmacsFrame) widget; + FRAME_PTR f = ew->emacs_frame.frame; + + ew->emacs_frame.internal_border_width = f->internal_border_width; } + +/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9 + (do not change this comment) */